am f8579330: Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"

* commit 'f8579330a5f6dea88a4d96e4d34ec165a7563030':
  Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
This commit is contained in:
Colin Cross
2015-09-23 21:03:03 +00:00
committed by Android Git Automerger

View File

@@ -56,7 +56,7 @@ PARSE_TIME_MAKE_GOALS := \
ANDROID_TARGETS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(NINJA_GOALS),$(ORIGINAL_MAKECMDGOALS)) 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))) EXTRA_TARGETS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(NINJA_GOALS),$(filter-out $(ORIGINAL_MAKECMDGOALS),$(MAKECMDGOALS)))
KATI_TARGETS := $(if $(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS)),$(ANDROID_TARGETS),) KATI_TARGETS := $(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS))
define replace_space_and_slash define replace_space_and_slash
$(subst /,_,$(subst $(space),_,$(sort $1))) $(subst /,_,$(subst $(space),_,$(sort $1)))