From 9644ab4dc452aa5989a37963d62f154c31e82155 Mon Sep 17 00:00:00 2001
From: Chih-Hung Hsieh <chh@google.com>
Date: Mon, 27 Jul 2015 10:10:44 -0700
Subject: [PATCH] ART: Use Clang default integrated assembler.

Issues with x86, arm32 and arm64 have been fixed.
Allow the use of the integrated assembler.

Bug: 22874917
Change-Id: Iacfffda29d57bfc931da568a9436c2e34cb38df6
---
 runtime/Android.mk | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/runtime/Android.mk b/runtime/Android.mk
index ce3e6d1f3..8f70d3089 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -393,13 +393,6 @@ define build-libart
   art_static_or_shared := $(3)
 
   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
-- 
2.11.0