diff options
| author | 2015-08-04 16:47:39 +0000 | |
|---|---|---|
| committer | 2015-08-04 16:47:39 +0000 | |
| commit | 1d558db0bcd841140f6fe1c6ba2e9a6de131649d (patch) | |
| tree | e89bb0e8334a051b8ebaa8946076752e4a4efba1 | |
| parent | 28a94765b4188faf51eb20d9a400273cf12136d0 (diff) | |
| parent | 9644ab4dc452aa5989a37963d62f154c31e82155 (diff) | |
Merge "ART: Use Clang default integrated assembler."
| -rw-r--r-- | runtime/Android.mk | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/runtime/Android.mk b/runtime/Android.mk index ce3e6d1f37..8f70d30894 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 |