diff options
| author | Stephen Hines <srhines@google.com> | 2016-03-02 18:26:29 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-06-09 23:46:02 -0700 |
| commit | fd80703db718f98bbbcba05be50967c78d7be443 (patch) | |
| tree | bf279c42f357b0f04e0bd1462ae2b9e954b50be4 | |
| parent | 98055703ed43ca66e4756b1994d90bb6bbb2e5e4 (diff) | |
| download | android_art-fd80703db718f98bbbcba05be50967c78d7be443.tar.gz android_art-fd80703db718f98bbbcba05be50967c78d7be443.tar.bz2 android_art-fd80703db718f98bbbcba05be50967c78d7be443.zip | |
Enable clang for ARM builds.
Bug: http://b/25130937
We disable the integrated assembler for the ARM interpreter because
Clang can't handle the syntax present.
Change-Id: I978d3f78e25819bb76ccb0f7f4b91a88e4b5a2de
| -rw-r--r-- | build/Android.common_build.mk | 3 | ||||
| -rw-r--r-- | runtime/Android.mk | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index 169a651049..b84154b307 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -83,8 +83,7 @@ ART_TARGET_CLANG := $(USE_CLANG_PLATFORM_BUILD) else ART_TARGET_CLANG := false endif -# b/25130937 -ART_TARGET_CLANG_arm := false +ART_TARGET_CLANG_arm := ART_TARGET_CLANG_arm64 := ART_TARGET_CLANG_mips := ART_TARGET_CLANG_mips64 := diff --git a/runtime/Android.mk b/runtime/Android.mk index 8c58b19a50..6a29195cc4 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -440,6 +440,7 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT ifeq ($$(art_target_or_host),target) $$(eval $$(call set-target-local-clang-vars)) $$(eval $$(call set-target-local-cflags-vars,$(2))) + LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as LOCAL_CFLAGS_$(DEX2OAT_TARGET_ARCH) += -DART_DEFAULT_INSTRUCTION_SET_FEATURES="$(LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES)" LOCAL_CFLAGS_$(2ND_DEX2OAT_TARGET_ARCH) += -DART_DEFAULT_INSTRUCTION_SET_FEATURES="$(2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES)" else # host @@ -548,4 +549,4 @@ LIBART_HOST_SRC_FILES_32 := LIBART_HOST_SRC_FILES_64 := LIBART_ENUM_OPERATOR_OUT_HEADER_FILES := LIBART_CFLAGS := -build-libart := +build-libart :=
\ No newline at end of file |