tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: a9daf15d87

Change-Id: I15afdf34b43317b3566a3c390b09f57fafbadec9
This commit is contained in:
Dan Willemsen 2016-11-11 05:41:02 +00:00 committed by android-build-merger
commit c87ea75be2
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/config.mk
View file

@ -861,7 +861,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

2
core/ninja_config.mk
View file

@ -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)))