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

Commit a9daf15d authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Fix vendor/google/build/ninja_config.mk"

parents 0f185d7c 1ff5fa11

core/config.mk

+0 −1
Original line number Diff line number Diff line
@@ -859,7 +859,6 @@ dont_bother_goals := clean clobber dataclean installclean \ 


ifndef KATI

include $(BUILD_SYSTEM)/ninja_config.mk

-include vendor/google/build/ninja_config.mk

include $(BUILD_SYSTEM)/soong_config.mk

endif

core/ninja_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ PARSE_TIME_MAKE_GOALS := \ 
	win_sdk \

	winsdk-tools



include $(wildcard vendor/*/build/ninja_config.mk)



# Any Android goals that need to be built.

ANDROID_GOALS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(CKATI) $(MAKEPARALLEL),\

    $(sort $(ORIGINAL_MAKECMDGOALS) $(MAKECMDGOALS)))