commit 3ee9daac6a3bf8d2a9030b99f62595330f22cafa
author Dan Albert <danalbert@google.com> Wed Sep 16 23:24:40 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 16 23:24:40 2015 +0000
tree a14b55db112c2856cab2633f194cda44b4dd39b2
parent 6fb36397e56336e08a75e7101d6d47a98a27aea1
parent 32f7ff14ce7fe30679beffb448a4a0e6f45cfcc4

Merge "Remove WITHOUT_(HOST|TARGET)_CLANG."

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 4bf31ad..7aa9937 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -198,10 +198,6 @@
     endif
 endif
 
-ifeq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)WITHOUT_$(my_prefix)CLANG)),true)
-  my_clang :=
-endif
-
 my_cpp_std_version := -std=gnu++14
 ifdef LOCAL_SDK_VERSION
     # The NDK handles this itself.

core/clang/config.mk

diff --git a/core/clang/config.mk b/core/clang/config.mk
index 03d7730..ae5df08 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -1,11 +1,5 @@
 ## Clang configurations.
 
-# WITHOUT_CLANG covers both HOST and TARGET
-ifeq ($(WITHOUT_CLANG),true)
-WITHOUT_TARGET_CLANG := true
-WITHOUT_HOST_CLANG := true
-endif
-
 LLVM_PREBUILTS_VERSION := 3.6
 LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/bin
 LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib/clang/$(LLVM_PREBUILTS_VERSION)/lib/linux/