| commit | 575a5649715ee50e0de8a107e8a5379d4c465382 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Wed Sep 10 23:15:15 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Sep 10 23:15:15 2014 +0000 |
| tree | 09ee802f371c500ecd938d9189fa430bc5b6e517 | |
| parent | 6c8f8f632da00bbc0cffc89a12b0716f8500f039 [diff] | |
| parent | 1ee99e31c630d6277c1e69f7c57bcf0b350538f6 [diff] |
Merge "Revert "Disable Clang internal assembler.""
diff --git a/runtime/Android.mk b/runtime/Android.mk index 493cfd1..5065c58 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk
@@ -345,8 +345,6 @@ 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