diff --git a/core/main.mk b/core/main.mk index 2291740c16..97ed93d5d1 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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 diff --git a/target/product/generic.mk b/target/product/generic.mk index d3f81b1ed7..fb5b727ba1 100644 --- a/target/product/generic.mk +++ b/target/product/generic.mk @@ -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))