Merge "Remove some uses of export/unexport" am: 76d45d8ddf am: 39f4686998 (699c68e1) · Commits · e / os / android_build

core/config.mk

+0 −15

Original line number	Diff line number	Diff line
		@@ -89,15 +89,6 @@ ORIGINAL_MAKECMDGOALS := $(MAKECMDGOALS)
		dist_goal := $(strip $(filter dist,$(MAKECMDGOALS)))
		MAKECMDGOALS := $(strip $(filter-out dist,$(MAKECMDGOALS)))

		# Tell python not to spam the source tree with .pyc files. This
		# only has an effect on python 2.6 and above.
		export PYTHONDONTWRITEBYTECODE := 1

		ifneq ($(filter --color=always, $(GREP_OPTIONS)),)
		$(warning The build system needs unmodified output of grep.)
		$(error Please remove --color=always from your $$GREP_OPTIONS)
		endif

		UNAME := $(shell uname -sm)

		SRC_TARGET_DIR := $(TOPDIR)build/target
		@@ -905,12 +896,6 @@ $(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

		# 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
		# For use with the LOCAL_SDK_VERSION variable for include $(BUILD_PACKAGE)