diff options
| author | Shinichiro Hamaji <hamaji@google.com> | 2015-09-07 05:38:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-07 05:38:24 +0000 |
| commit | e711afb154333407fe42e8ffe36bf76448d4f80f (patch) | |
| tree | 4de26200e9b0045fc199c1e2adb48c40359bcb2f | |
| parent | 762746705c7414985dbd457481dd33d4c69adcbb (diff) | |
| parent | 909e7f40ae6a80c589ca0d03ccd4d2ea1044ccdb (diff) | |
| download | build-e711afb154333407fe42e8ffe36bf76448d4f80f.tar.gz | |
Merge "Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix"
| -rw-r--r-- | core/ninja.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/ninja.mk b/core/ninja.mk index 33b32f0919..4925493554 100644 --- a/core/ninja.mk +++ b/core/ninja.mk @@ -5,12 +5,19 @@ NINJA_GOALS := fastincremental generateonly droid showcommands ANDROID_TARGETS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(NINJA_GOALS),$(ORIGINAL_MAKECMDGOALS)) +define replace_space_and_slash +$(subst /,_,$(subst $(space),_,$(sort $1))) +endef + KATI_NINJA_SUFFIX := ifneq ($(ANDROID_TARGETS),) -KATI_NINJA_SUFFIX := $(KATI_NINJA_SUFFIX)-$(subst $(space),_,$(sort $(ANDROID_TARGETS))) +KATI_NINJA_SUFFIX := $(KATI_NINJA_SUFFIX)-$(call replace_space_and_slash,$(ANDROID_TARGETS)) endif ifneq ($(ONE_SHOT_MAKEFILE),) -KATI_NINJA_SUFFIX := $(KATI_NINJA_SUFFIX)-mmm-$(subst /,_,$(strip $(ONE_SHOT_MAKEFILE))) +KATI_NINJA_SUFFIX := $(KATI_NINJA_SUFFIX)-mmm-$(call replace_space_and_slash,$(ONE_SHOT_MAKEFILE)) +endif +ifneq ($(BUILD_MODULES_IN_PATHS),) +KATI_NINJA_SUFFIX := $(KATI_NINJA_SUFFIX)-mmma-$(call replace_space_and_slash,$(BUILD_MODULES_IN_PATHS)) endif KATI_BUILD_NINJA := $(PRODUCT_OUT)/build$(KATI_NINJA_SUFFIX).ninja |