openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Remove some uses of export/unexport" am: 76d45d8ddf 

am: 39f4686998

Change-Id: Ib1e8692c19d5cd601a6d4554e7ab87b1eff59c2e
This commit is contained in:
Dan Willemsen 2018-02-27 21:34:40 +00:00 committed by android-build-merger
parent ee79f54630 39f4686998
commit b684761fd7
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/config.mk
View File

@ -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
@ -894,12 +885,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)