Merge "Extend static_whitelist_patterns"
diff --git a/core/main.mk b/core/main.mk
index 151a018..0713c91 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1171,7 +1171,7 @@
   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