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

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index b38f9bc..c1e6e09 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -451,6 +451,7 @@
     endif
     LOCAL_CFLAGS += $$(ART_HOST_CFLAGS)
     LOCAL_CFLAGS += -DART_DEFAULT_INSTRUCTION_SET_FEATURES="$(LIBART_HOST_DEFAULT_INSTRUCTION_SET_FEATURES)"
+    LOCAL_ASFLAGS += $$(ART_HOST_ASFLAGS)
 
     ifeq ($$(art_ndebug_or_debug),debug)
       LOCAL_CFLAGS += $$(ART_HOST_DEBUG_CFLAGS)