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

* commit '3ee9daac6a3bf8d2a9030b99f62595330f22cafa':
  Remove WITHOUT_(HOST|TARGET)_CLANG.
This commit is contained in:
Dan Albert 2015-09-16 23:31:41 +00:00 committed by Android Git Automerger
commit d9f9836e5e
2 changed files with 0 additions and 10 deletions

View File

@ -198,10 +198,6 @@ else ifeq ($(USE_CLANG_PLATFORM_BUILD),true)
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.

View File

@ -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/