diff options
| author | Ian Rogers <irogers@google.com> | 2014-02-28 16:20:21 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-02-28 19:03:57 -0800 |
| commit | b48b9eb6d181a1f52e2e605cf26a21505f1d46ed (patch) | |
| tree | 117d99c16f201b2f14adfe0922e56b9ff433c133 /build/Android.common.mk | |
| parent | 3c506f9877b4a106d93169b6bb5610b24a84d61c (diff) | |
| download | art-b48b9eb6d181a1f52e2e605cf26a21505f1d46ed.tar.gz art-b48b9eb6d181a1f52e2e605cf26a21505f1d46ed.tar.bz2 art-b48b9eb6d181a1f52e2e605cf26a21505f1d46ed.zip | |
Fix clang to compile and run host tests.
Don't use the computed goto interpreter with clang 3.4 as it causes compilation
to hang.
Avoid inclusion of LLVM_(HOST|DEVICE)_BUILD_MK except for with portable as it
sets clang incompatible cflags.
Most fixes are self-evident, for the quick dex file method inliner the enums
were being used with ostreams, so fix the enums and operator out python script
to allow this.
Note this change effects portable but this is untestable as portable was broken
by ELF file and mc linker changes.
Change-Id: Ia54348f6b1bd3f76d3b71c6e8c5f97626386b903
Diffstat (limited to 'build/Android.common.mk')
| -rw-r--r-- | build/Android.common.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index 704da68df2..28546e9283 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -91,10 +91,12 @@ LLVM_ROOT_PATH := external/llvm # Don't fail a dalvik minimal host build. -include $(LLVM_ROOT_PATH)/llvm.mk -# Clang build. -# ART_TARGET_CLANG := true +# Clang build support. +ART_TARGET_CLANG := false ifeq ($(HOST_OS),darwin) -ART_HOST_CLANG := true + ART_HOST_CLANG := true +else + ART_HOST_CLANG := false endif # directory used for dalvik-cache on device |