commit 12bd7210bb2f5738e33dfa3f2f1cba2e0aab4955
author Roland Levillain <rpl@google.com> Thu Jun 04 17:50:27 2015 +0100
committer Hiroshi Yamauchi <yamauchi@google.com> Thu Jun 04 11:26:19 2015 -0700
tree ceff4c27b7d3173da61dda12b1b05e062e82e3d9
parent 2519fc40d4ae89322d28d1ff610fe81bb90fb564

If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS.

This change ensures assembly files honoring heap poisoning
(notably used by stub_test) are compiled with
-DART_HEAP_POISONING=1 when this feature is turned on.

Bug: 21621105
Change-Id: I13fe456cd2733a09bdfd3a9808cfd70513b14698

compiler/Android.mk

diff --git a/compiler/Android.mk b/compiler/Android.mk
index 3f5271d..67536f0 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -234,6 +234,7 @@
   else # host
     LOCAL_CLANG := $(ART_HOST_CLANG)
     LOCAL_CFLAGS += $(ART_HOST_CFLAGS)
+    LOCAL_ASFLAGS += $(ART_HOST_ASFLAGS)
     LOCAL_LDLIBS := $(ART_HOST_LDLIBS)
     ifeq ($$(art_ndebug_or_debug),debug)
       LOCAL_CFLAGS += $(ART_HOST_DEBUG_CFLAGS)