forked from openkylin/platform_build
Merge "Workaround for existing packages check failure when the `generic` product is used with ART prebuilts."
This commit is contained in:
commit
40ea7379a8
|
@ -1263,8 +1263,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
|
||||
|
|
|
@ -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))
|
||||
|
|
Loading…
Reference in New Issue