diff options
| author | 2014-04-30 14:09:31 -0700 | |
|---|---|---|
| committer | 2014-05-02 11:01:46 -0700 | |
| commit | a7e7c2a644c7877496ca6f05d6bb15d286dfb597 (patch) | |
| tree | 573bd5dbfa6b9b40295caa3017baa20dc524cda4 | |
| parent | 4a0047afbaa6ce2b1823de559028bb1d8a111cb6 (diff) | |
Make arm64 build with ART_TARGET_CLANG.
Change-Id: If47ba8afbce3bbe9696cc7d6d08502e07aba5e7d
| -rw-r--r-- | build/Android.common.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index 1977682c56..6135571cdf 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -123,6 +123,11 @@ ifneq ($(WITHOUT_HOST_CLANG),true) ART_HOST_CLANG := true endif +# enable ART_TARGET_CLANG for ARM64 +ifneq (,$(filter $(TARGET_ARCH),arm64)) +ART_TARGET_CLANG := true +endif + # directory used for dalvik-cache on device ART_DALVIK_CACHE_DIR := /data/dalvik-cache @@ -193,10 +198,15 @@ art_cflags := \ -Wno-sign-promo \ -Wno-unused-parameter \ -Wstrict-aliasing \ - -fstrict-aliasing \ + -fstrict-aliasing + +# these are necessary for Clang ARM64 ART builds +ifeq ($(ART_TARGET_CLANG), true) +art_cflags += \ -Wno-implicit-exception-spec-mismatch \ -DNVALGRIND \ -Wno-unused-value +endif ifeq ($(ART_SMALL_MODE),true) art_cflags += -DART_SMALL_MODE=1 |