p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cc28d5315947f744f8a23b0e5619ba77838d4ea
This commit is contained in:
Treehugger Robot 2021-03-10 21:59:07 +00:00 committed by Automerger Merge Worker
parent dfa1752be7 15d6b176ad
commit 20ddb0d89a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/main.mk
View File

@ -1265,8 +1265,10 @@ ifdef FULL_BUILD
$(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)),\
$(INTERNAL_PRODUCT) includes non-existent modules in PRODUCT_PACKAGES)
$(call maybe-print-list-and-error,$(filter-out $(_nonexistent_modules),$(_allow_list)),\
$(INTERNAL_PRODUCT) includes redundant allow list entries for non-existent PRODUCT_PACKAGES)
# TODO(b/182105280): Consider re-enabling this check when the ART modules
# 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
# 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
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))