resolved conflicts for merge of d616a73d to master

Change-Id: I92007bc1c4987c9601b5478b06e3bbe3c02b9535

diff --cc core/clang/config.mk
index 0000000,d134a8d..952050c
mode 000000,100644..100644
--- /dev/null
--- 2/core/clang/config.mk
+++ b/core/clang/config.mk
@@@ -1,0 -1,60 +1,70 @@@
 -CLANG := $(HOST_OUT_EXECUTABLES)/clang$(HOST_EXECUTABLE_SUFFIX)
 -CLANG_CXX := $(HOST_OUT_EXECUTABLES)/clang++$(HOST_EXECUTABLE_SUFFIX)
 -LLVM_AS := $(HOST_OUT_EXECUTABLES)/llvm-as$(HOST_EXECUTABLE_SUFFIX)
 -LLVM_LINK := $(HOST_OUT_EXECUTABLES)/llvm-link$(HOST_EXECUTABLE_SUFFIX)
++ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
++LLVM_PREBUILTS_PATH := $(BUILD_OUT_EXECUTABLES)
++LLVM_PREBUILTS_HEADER_PATH := external/clang/lib/include
++else
++LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.3/bin
++LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.3/lib/clang/3.3/include/
++endif
++
++CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)
++CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX)
++CLANG_TBLGEN := $(LLVM_PREBUILTS_PATH)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX)
++LLVM_AS := $(LLVM_PREBUILTS_PATH)/llvm-as$(BUILD_EXECUTABLE_SUFFIX)
++LLVM_LINK := $(LLVM_PREBUILTS_PATH)/llvm-link$(BUILD_EXECUTABLE_SUFFIX)
++TBLGEN := $(LLVM_PREBUILTS_PATH)/tblgen$(BUILD_EXECUTABLE_SUFFIX)
+ 
 -CLANG_CONFIG_EXTRA_HOST_C_INCLUDES := external/clang/lib/include
 -CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES := external/clang/lib/include $(TARGET_OUT_HEADERS)/clang
+ 
+ # Clang flags for all host or target rules
+ CLANG_CONFIG_EXTRA_ASFLAGS :=
+ CLANG_CONFIG_EXTRA_CFLAGS :=
+ CLANG_CONFIG_EXTRA_CPPFLAGS :=
+ CLANG_CONFIG_EXTRA_LDFLAGS :=
+ 
+ CLANG_CONFIG_EXTRA_CFLAGS := \
+   -D__compiler_offsetof=__builtin_offsetof
+ 
+ CLANG_CONFIG_UNKNOWN_CFLAGS := \
+   -funswitch-loops \
+   -Wno-psabi \
+   -Wno-unused-but-set-variable \
+   -Wno-unused-but-set-parameter
+ 
+ # Clang flags for all host rules
+ CLANG_CONFIG_HOST_EXTRA_ASFLAGS :=
+ CLANG_CONFIG_HOST_EXTRA_CFLAGS :=
+ CLANG_CONFIG_HOST_EXTRA_CPPFLAGS :=
+ CLANG_CONFIG_HOST_EXTRA_LDFLAGS :=
+ 
+ # Clang flags for all target rules
+ CLANG_CONFIG_TARGET_EXTRA_ASFLAGS :=
+ CLANG_CONFIG_TARGET_EXTRA_CFLAGS := -nostdlibinc
+ CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS := -nostdlibinc
+ CLANG_CONFIG_TARGET_EXTRA_LDFLAGS :=
+ 
+ # HOST config
+ include $(BUILD_SYSTEM)/clang/HOST_$(HOST_ARCH).mk
+ 
+ # TARGET config
+ clang_2nd_arch_prefix :=
+ include $(BUILD_SYSTEM)/clang/TARGET_$(TARGET_ARCH).mk
+ 
+ # TARGET_2ND_ARCH config
+ ifdef TARGET_2ND_ARCH
+ 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_CONFIG_EXTRA_CFLAGS := -fsanitize=address
+ ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS := -Wl,-u,__asan_preinit
+ ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES := libdl libasan_preload
+ ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES := libasan
+ 
+ # This allows us to use the superset of functionality that compiler-rt
+ # provides to Clang (for supporting features like -ftrapv).
+ COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES := libcompiler_rt-extras

diff --cc core/config.mk
Simple merge