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

Merge "Workaround for existing packages check failure when the generic product is used with ART prebuilts." am: 40ea7379a8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1622507

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0889520b36c4ec2b82f531acd02b3ee3e6b4b465
This commit is contained in:
Treehugger Robot
2021-03-10 20:33:18 +00:00
committed by Automerger Merge Worker
parent 1b74125136 40ea7379a8
commit 1837e64d2d
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/main.mk
View File

@@ -1263,8 +1263,10 @@ ifdef FULL_BUILD
$(if $(or $(ALL_MODULES.$(m).PATH),$(call get-modules-for-2nd-arch,TARGET,$(m))),,$(m))) $(if $(or $(ALL_MODULES.$(m).PATH),$(call get-modules-for-2nd-arch,TARGET,$(m))),,$(m)))
$(call maybe-print-list-and-error,$(filter-out $(_allow_list),$(_nonexistent_modules)),\ $(call maybe-print-list-and-error,$(filter-out $(_allow_list),$(_nonexistent_modules)),\
$(INTERNAL_PRODUCT) includes non-existent modules in PRODUCT_PACKAGES) $(INTERNAL_PRODUCT) includes non-existent modules in PRODUCT_PACKAGES)
$(call maybe-print-list-and-error,$(filter-out $(_nonexistent_modules),$(_allow_list)),\ # TODO(b/182105280): Consider re-enabling this check when the ART modules
$(INTERNAL_PRODUCT) includes redundant allow list entries for non-existent PRODUCT_PACKAGES) # have been cleaned up from the allowed_list in target/product/generic.mk.
#$(call maybe-print-list-and-error,$(filter-out $(_nonexistent_modules),$(_allow_list)),\
# $(INTERNAL_PRODUCT) includes redundant allow list entries for non-existent PRODUCT_PACKAGES)
endif endif
# Check to ensure that all modules in PRODUCT_HOST_PACKAGES exist # Check to ensure that all modules in PRODUCT_HOST_PACKAGES exist

6
target/product/generic.mk
View File

@@ -29,4 +29,10 @@ PRODUCT_DEVICE := generic
PRODUCT_NAME := generic PRODUCT_NAME := generic
allowed_list := product_manifest.xml allowed_list := product_manifest.xml
# TODO(b/182105280): When ART prebuilts are used in this product, Soong doesn't
# produce any Android.mk entries for them. Exclude them until that problem is
# fixed.
allowed_list += com.android.art com.android.art.debug
$(call enforce-product-packages-exist,$(allowed_list)) $(call enforce-product-packages-exist,$(allowed_list))