diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-15 09:03:20 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-15 09:03:20 -0700 |
| commit | 28f5c0973a55c4d29e974ef1394d6b013fe966a0 (patch) | |
| tree | 79349e3bf0ad710021fe9332876bf26bf41b5731 /build/Android.common.mk | |
| parent | 30b65201aa9c953433dbde1288e9b1b883042cd1 (diff) | |
| download | art-28f5c0973a55c4d29e974ef1394d6b013fe966a0.tar.gz art-28f5c0973a55c4d29e974ef1394d6b013fe966a0.tar.bz2 art-28f5c0973a55c4d29e974ef1394d6b013fe966a0.zip | |
Don't import llvm.mk for non-portable builds.
Change-Id: I447e7d816c0e4f84bc4d13bc34ff93b026d192b5
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 188ddb5374..a4f13b853a 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -116,9 +116,11 @@ endif ART_DEFAULT_GC_TYPE ?= CMS ART_DEFAULT_GC_TYPE_CFLAGS := -DART_DEFAULT_GC_TYPE_IS_$(ART_DEFAULT_GC_TYPE) -LLVM_ROOT_PATH := external/llvm -# Don't fail a dalvik minimal host build. --include $(LLVM_ROOT_PATH)/llvm.mk +ifeq ($(ART_USE_PORTABLE_COMPILER),true) + LLVM_ROOT_PATH := external/llvm + # Don't fail a dalvik minimal host build. + -include $(LLVM_ROOT_PATH)/llvm.mk +endif # Clang build support. # Target builds use GCC by default. |