Support WITHOUT_CLANG builds
Change-Id: I29ce1e394137596f3663c7f2c13640f9b73d5c9e
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 34b692f..cc46146 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -91,14 +91,13 @@
# Don't fail a dalvik minimal host build.
-include $(LLVM_ROOT_PATH)/llvm.mk
-# Clang build support. By default, host builds use clang for better warnings.
+# Clang build support.
# Target builds use GCC by default.
-# TODO: work out why arm64 target builds need GCC on the host.
ART_TARGET_CLANG := false
-ifneq ($(TARGET_ARCH),arm64)
+ART_HOST_CLANG := false
+ifneq ($(WITHOUT_CLANG),true)
+ # By default, host builds use clang for better warnings.
ART_HOST_CLANG := true
-else
- ART_HOST_CLANG := false
endif
# directory used for dalvik-cache on device
@@ -158,7 +157,7 @@
-DDYNAMIC_ANNOTATIONS_ENABLED=1 \
-UNDEBUG
-ART_HOST_CFLAGS := $(art_cflags) -DANDROID_SMP=1 -DART_BASE_ADDRESS=$(LIBART_IMG_HOST_BASE_ADDRESS)
+ART_HOST_CFLAGS := $(art_cflags) -DANDROID_SMP=1 -DART_BASE_ADDRESS=$(LIBART_IMG_HOST_BASE_ADDRESS)
ART_HOST_CFLAGS += -DART_DEFAULT_INSTRUCTION_SET_FEATURES=default
ART_TARGET_CFLAGS := $(art_cflags) -DART_TARGET -DART_BASE_ADDRESS=$(LIBART_IMG_TARGET_BASE_ADDRESS)
diff --git a/runtime/Android.mk b/runtime/Android.mk
index 18e2d3e..98bec85 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -302,7 +302,7 @@
# $(1): target or host
# $(2): ndebug or debug
-# 3(3): true or false for LOCAL_CLANG
+# $(3): true or false for LOCAL_CLANG
define build-libart
ifneq ($(1),target)
ifneq ($(1),host)
