commit d619cab991f116d7a90c9abeff8770e7d7a3a45a
author Chih-Hung Hsieh <chh@google.com> Tue Sep 09 13:59:33 2014 -0700
committer Chih-Hung Hsieh <chh@google.com> Tue Sep 09 13:59:33 2014 -0700
tree 1ebdf849dac174fe86b4540b5629956430992ad2
parent 9b2b927f573264c2f0d66b24ceeb361857a41ab3

Disable Clang internal assembler.

To avoid compilation errors with macros and directives in asm_support_x86.S.

BUG: 17443165
Change-Id: Ia89387bf2213cf1bfd4dd7248a19b47391e8fb67

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index 5065c58..493cfd1 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -345,6 +345,8 @@
   art_ndebug_or_debug := $(2)
 
   include $$(CLEAR_VARS)
+  # Clang assembler has problem with macros in asm_support_x86.S, http://b/17443165.
+  LOCAL_CLANG_ASFLAGS += -no-integrated-as
   LOCAL_CPP_EXTENSION := $$(ART_CPP_EXTENSION)
   ifeq ($$(art_ndebug_or_debug),ndebug)
     LOCAL_MODULE := libart