From ab50b8fa85c06ceaa3be2252f7ec0e6747b381fb Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Tue, 24 Mar 2020 22:42:41 +0900 Subject: [PATCH] Extend static_whitelist_patterns product-installed-files generates more default artifacts than $(call module-installed-files,$(call auto-included-modules)), and it causes problems when we try to apply this mechanism to other partition So use product-installed-files with an empty parameter as static whitelist Test: apply require-artifacts-in-path to other partition(or path), and then, m nothing Test: add system module outside mainline_system.mk, and check if there is error. Bug: 148993225 Change-Id: Ie110f20ff833229b23a777ff1decb32f84b9cef7 --- core/main.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/main.mk b/core/main.mk index 277ef7d6d9..81529f6259 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1178,7 +1178,7 @@ ifdef FULL_BUILD static_whitelist_patterns += %__auto_generated_rro_product.apk static_whitelist_patterns += %__auto_generated_rro_vendor.apk # Auto-included targets are not considered - static_whitelist_patterns += $(call module-installed-files,$(call auto-included-modules)) + static_whitelist_patterns += $(call product-installed-files,) # $(PRODUCT_OUT)/apex is where shared libraries in APEXes get installed. # The path can be considered as a fake path, as the shared libraries # are installed there just to have symbols files for them under