commit 28f5c0973a55c4d29e974ef1394d6b013fe966a0
author Ian Rogers <irogers@google.com> Thu May 15 09:03:20 2014 -0700
committer Ian Rogers <irogers@google.com> Thu May 15 09:03:20 2014 -0700
tree 79349e3bf0ad710021fe9332876bf26bf41b5731
parent 30b65201aa9c953433dbde1288e9b1b883042cd1

Don't import llvm.mk for non-portable builds.

Change-Id: I447e7d816c0e4f84bc4d13bc34ff93b026d192b5

build/Android.common.mk

diff --git a/build/Android.common.mk b/build/Android.common.mk
index 188ddb5..a4f13b8 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -116,9 +116,11 @@
 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.