summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2014-10-04 20:52:26 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-10-04 20:52:27 +0000
commit2d4e89e97812aeca16ff058d7286f29b7549c43a (patch)
tree856b69e2da2e7676faf495d54290edf3fec61250
parent15a7fc2e25cede6519a5a315cede27ec84566405 (diff)
parent88c05693f090bc2562a530a4696082229de98840 (diff)
Merge "Respect USE_CLANG_PLATFORM_BUILD for art builds"
-rw-r--r--build/Android.common_build.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index e4be21bfc2..55a482197f 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -122,7 +122,11 @@ ifneq ($(WITHOUT_HOST_CLANG),true)
endif
# Clang on the target. Target builds use GCC by default.
+ifneq ($(USE_CLANG_PLATFORM_BUILD),)
+ART_TARGET_CLANG := $(USE_CLANG_PLATFORM_BUILD)
+else
ART_TARGET_CLANG := false
+endif
ART_TARGET_CLANG_arm :=
ART_TARGET_CLANG_arm64 :=
ART_TARGET_CLANG_mips :=