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

Merge "Remove the APP-* goal"

This commit is contained in:
Treehugger Robot 2019-07-29 16:30:52 +00:00 committed by Gerrit Code Review
parent 98efd8290e 01ab167a20
commit 6f8e3da035
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ninja_config.mk
View File

@ -7,7 +7,7 @@ endif
KATI_OUTPUT_PATTERNS := $(OUT_DIR)/build%.ninja $(OUT_DIR)/ninja%.sh KATI_OUTPUT_PATTERNS := $(OUT_DIR)/build%.ninja $(OUT_DIR)/ninja%.sh
# Modifier goals we don't need to pass to Ninja. # Modifier goals we don't need to pass to Ninja.
NINJA_EXCLUDE_GOALS := all APP-% PRODUCT-% NINJA_EXCLUDE_GOALS := all PRODUCT-%
# A list of goals which affect parsing of makefiles and we need to pass to Kati. # A list of goals which affect parsing of makefiles and we need to pass to Kati.
PARSE_TIME_MAKE_GOALS := \ PARSE_TIME_MAKE_GOALS := \

10
core/product_config.mk
View File

@ -139,15 +139,7 @@ endif # CALLED_FROM_SETUP
ifeq ($(CALLED_FROM_SETUP),true) 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) $(error The APP-* goal is no longer supported. Use `TARGET_BUILD_APPS="<app>" m droid` instead)
$(error Only one APP-* goal may be specified; saw "$(unbundled_goals)")
endif
TARGET_BUILD_APPS := $(strip $(subst -, ,$(patsubst APP-%,%,$(unbundled_goals))))
ifneq ($(filter droid,$(MAKECMDGOALS)),)
override MAKECMDGOALS := $(patsubst $(unbundled_goals),,$(MAKECMDGOALS))
else
override MAKECMDGOALS := $(patsubst $(unbundled_goals),droid,$(MAKECMDGOALS))
endif
endif # unbundled_goals endif # unbundled_goals
endif endif