Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da8f4952 authored Dec 15, 2016 by Dan Willemsen Committed by android-build-merger Dec 15, 2016

Merge "Remove variables exported by Soong"

am: f61205d5

Change-Id: I2140a80261c0062e220656e6017b3142d486176f

parents c29cf6ef f61205d5

core/clang/config.mk

+0 −7

Original line number	Diff line number	Diff line
		## Clang configurations.

		LLVM_PREBUILTS_PATH := $(LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/bin
		LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib64/clang/$(LLVM_RELEASE_VERSION)/lib/linux/

		# These will come from Soong, drop the environment versions
		unexport CLANG
		unexport CLANG_CXX
		unexport CCC_CC
		unexport CCC_CXX

		CLANG_TBLGEN := $(BUILD_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX)
		LLVM_TBLGEN := $(BUILD_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX)

core/clang/versions.mk

+0 −2

Original line number	Diff line number	Diff line
		## Clang/LLVM release versions.

		LLVM_RELEASE_VERSION := 3.8
		LLVM_PREBUILTS_VERSION ?= clang-3289846
		LLVM_PREBUILTS_BASE ?= prebuilts/clang/host

core/config.mk

+5 −2

Original line number	Diff line number	Diff line
		@@ -716,8 +716,11 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT := $(call first_non_empt
		$(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default
		endif

		# define clang/llvm tools and global flags
		include $(BUILD_SYSTEM)/clang/config.mk
		# These will come from Soong, drop the environment versions
		unexport CLANG
		unexport CLANG_CXX
		unexport CCC_CC
		unexport CCC_CXX

		# ###############################################################
		# Collect a list of the SDK versions that we could compile against

core/main.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,8 @@ endif

		include $(SOONG_MAKEVARS_MK)

		include $(BUILD_SYSTEM)/clang/config.mk

		# Write the build number to a file so it can be read back in
		# without changing the command line every time. Avoids rebuilds
		# when using ninja.