Merge "Skip auto-gen rro packages for path requirements."

am: 5558838be1

Change-Id: I7335715433a80a79f02d0979290d1270d6d08403
This commit is contained in:
Anton Hansson 2018-07-20 01:20:32 -07:00 committed by android-build-merger
commit eccff5a946
1 changed files with 2 additions and 0 deletions

View File

@ -998,6 +998,8 @@ $(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\
$(eval whitelist_patterns := $(call resolve-product-relative-paths,$(whitelist))) \
$(eval files := $(call product-installed-files, $(makefile))) \
$(eval files := $(filter-out $(TARGET_OUT_FAKE)/% $(HOST_OUT)/%,$(files))) \
$(eval # RROs become REQUIRED by the source module, but are always placed on the vendor partition.) \
$(eval files := $(filter-out %__auto_generated_rro.apk,$(files))) \
$(eval offending_files := $(filter-out $(path_patterns) $(whitelist_patterns),$(files))) \
$(call maybe-print-list-and-error,$(offending_files),$(makefile) produces files outside its artifact path requirement.) \
$(eval unused_whitelist := $(filter-out $(files),$(whitelist_patterns))) \