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

Merge "Use CALLED_FROM_SETUP instead of KATI" am: bd4239a1e1 am: 8e7153bf98 

am: 9e000cd290

Change-Id: Ie96924dcc57f253f8a1904a3d97263361ec83a4d
This commit is contained in:
Dan Willemsen 2017-10-13 09:55:07 +00:00 committed by android-build-merger
parent 29d28e58fb 9e000cd290
commit a4e6ce4fdc
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/config.mk
View File

@ -304,7 +304,7 @@ combo_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)
include $(BUILD_SYSTEM)/combo/select.mk include $(BUILD_SYSTEM)/combo/select.mk
endif endif
ifndef KATI ifeq ($(CALLED_FROM_SETUP),true)
include $(BUILD_SYSTEM)/ccache.mk include $(BUILD_SYSTEM)/ccache.mk
include $(BUILD_SYSTEM)/goma.mk include $(BUILD_SYSTEM)/goma.mk
@ -952,7 +952,7 @@ dont_bother_goals := out \
vbmetaimage-nodeps \ vbmetaimage-nodeps \
product-graph dump-products product-graph dump-products
ifndef KATI ifeq ($(CALLED_FROM_SETUP),true)
include $(BUILD_SYSTEM)/ninja_config.mk include $(BUILD_SYSTEM)/ninja_config.mk
include $(BUILD_SYSTEM)/soong_config.mk include $(BUILD_SYSTEM)/soong_config.mk
endif endif

2
core/envsetup.mk
View File

@ -639,7 +639,7 @@ ifeq (,$(strip $(DIST_DIR)))
DIST_DIR := $(OUT_DIR)/dist DIST_DIR := $(OUT_DIR)/dist
endif endif
ifndef KATI ifeq ($(CALLED_FROM_SETUP),true)
PRINT_BUILD_CONFIG ?= true PRINT_BUILD_CONFIG ?= true
endif endif

6
core/product_config.mk
View File

@ -88,7 +88,7 @@ INTERNAL_VALID_VARIANTS := user userdebug eng
# Provide "PRODUCT-<prodname>-<goal>" targets, which lets you build # Provide "PRODUCT-<prodname>-<goal>" targets, which lets you build
# a particular configuration without needing to set up the environment. # a particular configuration without needing to set up the environment.
# #
ifndef KATI ifeq ($(CALLED_FROM_SETUP),true)
product_goals := $(strip $(filter PRODUCT-%,$(MAKECMDGOALS))) product_goals := $(strip $(filter PRODUCT-%,$(MAKECMDGOALS)))
ifdef product_goals ifdef product_goals
# Scrape the product and build names out of the goal, # Scrape the product and build names out of the goal,
@ -129,14 +129,14 @@ ifdef product_goals
# position, in case it matters. # position, in case it matters.
override MAKECMDGOALS := $(patsubst $(goal_name),$(default_goal_substitution),$(MAKECMDGOALS)) override MAKECMDGOALS := $(patsubst $(goal_name),$(default_goal_substitution),$(MAKECMDGOALS))
endif endif
endif # !KATI endif # CALLED_FROM_SETUP
# else: Use the value set in the environment or buildspec.mk. # else: Use the value set in the environment or buildspec.mk.
# --------------------------------------------------------------- # ---------------------------------------------------------------
# Provide "APP-<appname>" targets, which lets you build # Provide "APP-<appname>" targets, which lets you build
# an unbundled app. # an unbundled app.
# #
ifndef KATI ifeq ($(CALLED_FROM_SETUP),true)
unbundled_goals := $(strip $(filter APP-%,$(MAKECMDGOALS))) unbundled_goals := $(strip $(filter APP-%,$(MAKECMDGOALS)))
ifdef unbundled_goals ifdef unbundled_goals
ifneq ($(words $(unbundled_goals)),1) ifneq ($(words $(unbundled_goals)),1)