Merge "Re-add product_MODULES" am: 2bfa7401c7 am: 47875b5bb8

am: 6953f81ea2 Change-Id: I8997556f197fd2f706d91d5f4c2d02391d29b925
2018-10-22 05:48:16 -07:00
parent ab752bb403 6953f81ea2
commit 915ce52107
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.