From f37a35cdd0cb02f1d26d0c890c5b90bf3e818b7d Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 12 Oct 2018 11:34:29 +0100
Subject: [PATCH] Re-add product_MODULES

This variable is depended on by vendor_module_check.mk

Bug: 117638909
Test: build_test
Change-Id: I93f7056b001ca803c88e1e1dfebe204f289c59ab
---
 core/main.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/main.mk b/core/main.mk
index 7f673e9a48..0f48f5b035 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1010,6 +1010,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.
   all_offending_files :=