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

Merge "Support disabling artifact path requirements"

Browse Source 
am: 436d7b7336

Change-Id: I86dcbcf3aa610586ac7ff5f908c95047c992edf5
This commit is contained in:
Anton Hansson
2018-11-09 09:42:11 -08:00
committed by android-build-merger
parent 09a0b757cd 436d7b7336
commit fe5e3b5857
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/main.mk
View File

@@ -1075,7 +1075,7 @@ ifdef FULL_BUILD
product_MODULES := $(_pif_modules) product_MODULES := $(_pif_modules)
# Verify the artifact path requirements made by included products. # Verify the artifact path requirements made by included products.
ifneq (true,$(DISABLE_ARTIFACT_PATH_REQUIREMENTS))
# Fakes don't get installed, and host files are irrelevant. # Fakes don't get installed, and host files are irrelevant.
static_whitelist_patterns := $(TARGET_OUT_FAKE)/% $(HOST_OUT)/% static_whitelist_patterns := $(TARGET_OUT_FAKE)/% $(HOST_OUT)/%
# RROs become REQUIRED by the source module, but are always placed on the vendor partition. # RROs become REQUIRED by the source module, but are always placed on the vendor partition.
@@ -1119,6 +1119,7 @@ ifdef FULL_BUILD
$(PRODUCT_OUT)/offending_artifacts.txt: $(PRODUCT_OUT)/offending_artifacts.txt:
rm -f $@ rm -f $@
$(foreach f,$(sort $(all_offending_files)),echo $(f) >> $@;) $(foreach f,$(sort $(all_offending_files)),echo $(f) >> $@;)
endif
else else
# We're not doing a full build, and are probably only including # We're not doing a full build, and are probably only including
# a subset of the module makefiles. Don't try to build any modules # a subset of the module makefiles. Don't try to build any modules