commit 87e0e8a7642bd1f5bfdb7b8313df60a77119690a
author Colin Cross <ccross@android.com> Wed Sep 23 21:53:08 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 23 21:53:08 2015 +0000
tree 1f6740b4554805b2e452fc8b138f88efce1360a4
parent f8579330a5f6dea88a4d96e4d34ec165a7563030
parent 84a8ca3173ec7b386690491f6a5db7d3c6f1b90b

Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""

core/ninja.mk

diff --git a/core/ninja.mk b/core/ninja.mk
index 24bf417..2aa0b28 100644
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -56,7 +56,7 @@
 
 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))
+KATI_TARGETS := $(if $(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS)),$(ANDROID_TARGETS),)
 
 define replace_space_and_slash
 $(subst /,_,$(subst $(space),_,$(sort $1)))