p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Dan Willemsen 2016-11-11 05:35:04 +00:00 committed by Gerrit Code Review
parent 0f185d7c3b 1ff5fa11c4
commit a9daf15d87
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

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

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