From 4b502328a515aff01fb566251e9c1cf3bfac286d Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 19 Aug 2016 22:35:58 -0700
Subject: [PATCH] Add define needed by new vixl

vixl now requires -DVIXL_INCLUDE_SIMULATOR_AARCH64 when including
simulator-aarch64.h.

Tests: mmma -j art, m -j build-art-tests
Change-Id: I9b9bb7ca618ccbb505de943825f5e9517542fa1b
---
 runtime/simulator/Android.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/simulator/Android.mk b/runtime/simulator/Android.mk
index a34a84100..e39af2dcd 100644
--- a/runtime/simulator/Android.mk
+++ b/runtime/simulator/Android.mk
@@ -22,6 +22,9 @@ LIBART_SIMULATOR_SRC_FILES := \
   code_simulator.cc \
   code_simulator_arm64.cc
 
+LIBART_SIMULATOR_CFLAGS := \
+  -DVIXL_INCLUDE_SIMULATOR_AARCH64
+
 # $(1): target or host
 # $(2): ndebug or debug
 define build-libart-simulator
@@ -54,6 +57,7 @@ define build-libart-simulator
   LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 
   LOCAL_SRC_FILES := $$(LIBART_SIMULATOR_SRC_FILES)
+  LOCAL_CFLAGS := $$(LIBART_SIMULATOR_CFLAGS)
 
   ifeq ($$(art_target_or_host),target)
     $(call set-target-local-clang-vars)
-- 
2.11.0