Merge "Re-add product_MODULES"

am: 2bfa7401c7 Change-Id: I2a33273045e4eef07b53207c331f9aa371bd4305
2018-10-22 05:39:54 -07:00
parent 4be4b6a522 2bfa7401c7
commit 47875b5bb8
1 changed files with 2 additions and 0 deletions
--- a/core/main.mk
+++ b/core/main.mk
@@ -1033,6 +1033,8 @@ endif

 ifdef FULL_BUILD
  product_FILES := $(call product-installed-files, $(INTERNAL_PRODUCT))
+  # WARNING: The product_MODULES variable is depended on by external files.
+  product_MODULES := $(_pif_modules)

  # Verify the artifact path requirements made by included products.