commit c9596958f8da9603c2b17a5df4d7fa6cbd01ff1e
author Chih-Hung Hsieh <chh@google.com> Thu Oct 16 12:14:02 2014 -0700
committer Chih-Hung Hsieh <chh@google.com> Thu Oct 16 15:29:59 2014 -0700
tree 193da271d4a7ae3c42ff546bbf02e656d3b06ead
parent 58e51f38e2304a08aa9ec380383e0b3614f96a96

Add -no-integrated-as at local level.

Later we will enable integrated-as as default at the global level.

BUG: 17820427
BUG: 17443165
Change-Id: Idbbeccb7f725a63530c65e33723d1328c80443b3

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index e954476..f37b4ea 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -346,6 +346,13 @@
   art_ndebug_or_debug := $(2)
 
   include $$(CLEAR_VARS)
+  # Clang assembler has problem with macros in asm_support_x86.S, http://b/17443165,
+  # on linux. Yet sdk on mac needs integrated assembler.
+  ifeq ($$(HOST_OS),darwin)
+    LOCAL_CLANG_ASFLAGS += -integrated-as
+  else
+    LOCAL_CLANG_ASFLAGS += -no-integrated-as
+  endif
   LOCAL_CPP_EXTENSION := $$(ART_CPP_EXTENSION)
   ifeq ($$(art_ndebug_or_debug),ndebug)
     LOCAL_MODULE := libart