commit c7244404c3d1e523af981821f5bc28e486beebb8
author Dan Albert <danalbert@google.com> Wed Sep 16 23:48:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 16 23:48:10 2015 +0000
tree 5efacf91cf7f11998cac40a3af16df31f795d892
parent fabe585e4f9b25b5214f5baf1ec8efe189477d60
parent 0c24a1ff909c968666fe00ed36138b5c8de91b62

am 0c24a1ff: am d9f9836e: am 3ee9daac: Merge "Remove WITHOUT_(HOST|TARGET)_CLANG."

* commit '0c24a1ff909c968666fe00ed36138b5c8de91b62':
  Remove WITHOUT_(HOST|TARGET)_CLANG.

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 7bc3784..79197a7 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 53230c1..1226d86 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/