StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix vendor/google/build/ninja_config.mk" am: a9daf15d87 am: c87ea75be2 am: a8a8e13f81

Browse Source 
am: 16953b869c

Change-Id: I2d75d6be8be9309f8534def7e3502601701d5eae
This commit is contained in:
Dan Willemsen
2016-11-11 06:02:02 +00:00
committed by android-build-merger
parent 10fcbc543d 16953b869c
commit d555c8aacb
2 changed files with 2 additions and 1 deletions
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 ifndef KATI
include $(BUILD_SYSTEM)/ninja_config.mk include $(BUILD_SYSTEM)/ninja_config.mk
-include vendor/google/build/ninja_config.mk
include $(BUILD_SYSTEM)/soong_config.mk include $(BUILD_SYSTEM)/soong_config.mk
endif endif

2
core/ninja_config.mk
View File

@@ -60,6 +60,8 @@ PARSE_TIME_MAKE_GOALS := \
win_sdk \ win_sdk \
winsdk-tools winsdk-tools
include $(wildcard vendor/*/build/ninja_config.mk)
# Any Android goals that need to be built. # Any Android goals that need to be built.
ANDROID_GOALS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(CKATI) $(MAKEPARALLEL),\ ANDROID_GOALS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(CKATI) $(MAKEPARALLEL),\
$(sort $(ORIGINAL_MAKECMDGOALS) $(MAKECMDGOALS))) $(sort $(ORIGINAL_MAKECMDGOALS) $(MAKECMDGOALS)))