Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 909e7f40 authored by Shinichiro Hamaji's avatar Shinichiro Hamaji
Browse files

Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix 

So that switching between two different mmma targets won't
need regenerating ninja files.

Change-Id: Ifddd75ec49abd3ab2a54c6afbb902b0b32359db8
parent 4379e2b8

core/ninja.mk

+9 −2
Original line number Diff line number Diff line
@@ -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