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

Merge "Don't apply path enforcements for non-full builds."

Browse Source 
am: 362fff4fcd

Change-Id: I8578f069aa8b032832ef35dd78b973b517e6b547
This commit is contained in:
Anton Hansson
2018-07-26 03:10:49 -07:00
committed by android-build-merger
parent 50f59655ba 362fff4fcd
commit b682674226
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/main.mk
View File

@@ -981,16 +981,10 @@ endif
ifdef FULL_BUILD ifdef FULL_BUILD
product_FILES := $(call product-installed-files, $(INTERNAL_PRODUCT)) product_FILES := $(call product-installed-files, $(INTERNAL_PRODUCT))
else
# 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
# requested by the product, because we probably won't have rules
# to build them.
product_FILES :=
endif
# Verify the artifact path requirements made by included products. # Verify the artifact path requirements made by included products.
$(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\ all_offending_files :=
$(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\
$(eval requirements := $(PRODUCTS.$(makefile).ARTIFACT_PATH_REQUIREMENTS)) \ $(eval requirements := $(PRODUCTS.$(makefile).ARTIFACT_PATH_REQUIREMENTS)) \
$(eval ### Verify that the product only produces files inside its path requirements.) \ $(eval ### Verify that the product only produces files inside its path requirements.) \
$(eval whitelist := $(PRODUCTS.$(makefile).ARTIFACT_PATH_WHITELIST)) \ $(eval whitelist := $(PRODUCTS.$(makefile).ARTIFACT_PATH_WHITELIST)) \
@@ -1016,10 +1010,17 @@ $(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\
$(eval unused_whitelist := $(filter-out $(extra_files),$(whitelist_patterns))) \ $(eval unused_whitelist := $(filter-out $(extra_files),$(whitelist_patterns))) \
$(call maybe-print-list-and-error,$(unused_whitelist),$(INTERNAL_PRODUCT) includes redundant artifact path requirement whitelist entries.) \ $(call maybe-print-list-and-error,$(unused_whitelist),$(INTERNAL_PRODUCT) includes redundant artifact path requirement whitelist entries.) \
) \ ) \
) )
$(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) >> $@;)
else
# 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
# requested by the product, because we probably won't have rules
# to build them.
product_FILES :=
endif
ifeq (0,1) ifeq (0,1)
$(info product_FILES for $(TARGET_DEVICE) ($(INTERNAL_PRODUCT)):) $(info product_FILES for $(TARGET_DEVICE) ($(INTERNAL_PRODUCT)):)