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

am 96caa978: am 02d04b4d: Merge "Pass all goals to kati when "dist" is in goals" 

* commit '96caa97814b2c439030dac0f2fc73aa87627ddcd':
  Pass all goals to kati when "dist" is in goals
This commit is contained in:
Colin Cross 2015-09-29 17:18:54 +00:00 committed by Android Git Automerger
parent 9be13a763c 96caa97814
commit c09a2e7ed8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/ninja.mk
View File

@ -54,7 +54,9 @@ PARSE_TIME_MAKE_GOALS := \
ANDROID_TARGETS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(NINJA_GOALS),$(ORIGINAL_MAKECMDGOALS))
EXTRA_TARGETS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(NINJA_GOALS),$(filter-out $(ORIGINAL_MAKECMDGOALS),$(MAKECMDGOALS)))
KATI_TARGETS := $(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS))
# The target "dist" changes its behavior depending whether other
# targets are specified or not. See distdir.mk for detail.
KATI_TARGETS := $(if $(filter dist,$(ANDROID_TARGETS)),$(ANDROID_TARGETS),$(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS)))
define replace_space_and_slash
$(subst /,_,$(subst $(space),_,$(sort $1)))