From 88c05693f090bc2562a530a4696082229de98840 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer Date: Sat, 4 Oct 2014 19:02:06 +0200 Subject: [PATCH] Respect USE_CLANG_PLATFORM_BUILD for art builds Without this patch, ART_TARGET_CLANG is set to false unconditionally. It should be set to whatever USE_CLANG_PLATFORM_BUILD requests, if the latter is set. Change-Id: I29c4397c308a1549c2097aad2c997fe732be27ac Signed-off-by: Bernhard Rosenkraenzer --- build/Android.common_build.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index e4be21bfc..55a482197 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 := -- 2.11.0