summaryrefslogtreecommitdiffstats
path: root/core/clang
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-09-26 19:53:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-26 19:53:06 +0000
commit7a5d35b22ad7d262eb920917acc87168281ec341 (patch)
tree2a8c2a6d83f7e022f73ca541823e4cc5a370c12c /core/clang
parent03b61bea0d58b3e7d7f77bcbd8fc473c8e933a39 (diff)
parent145eddfd229b118fadd4f4f255dbecc1a79b5e2b (diff)
downloadbuild-7a5d35b22ad7d262eb920917acc87168281ec341.zip
build-7a5d35b22ad7d262eb920917acc87168281ec341.tar.gz
build-7a5d35b22ad7d262eb920917acc87168281ec341.tar.bz2
am 145eddfd: am 670018fd: Merge "Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables."
* commit '145eddfd229b118fadd4f4f255dbecc1a79b5e2b': Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables.
Diffstat (limited to 'core/clang')
-rw-r--r--core/clang/config.mk6
1 files changed, 0 insertions, 6 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk
index c973a16..4284bbe 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -8,7 +8,6 @@ endif
LLVM_PREBUILTS_VERSION := 3.5
LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/bin
-LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/lib/clang/$(LLVM_PREBUILTS_VERSION)/include/
CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)
CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX)
@@ -90,11 +89,6 @@ clang_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)
include $(BUILD_SYSTEM)/clang/TARGET_$(TARGET_2ND_ARCH).mk
endif
-
-# Clang compiler-specific libc headers
-CLANG_CONFIG_EXTRA_HOST_C_INCLUDES := $(LLVM_PREBUILTS_HEADER_PATH)
-CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES := $(LLVM_PREBUILTS_HEADER_PATH) $(TARGET_OUT_HEADERS)/clang
-
# Address sanitizer clang config
ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan_$(TARGET_ARCH)_android
ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -fsanitize=address -fno-omit-frame-pointer