commit 489458fa3161ed0c299f737da68376862ce13f9f
author Ying Wang <wangying@google.com> Thu Aug 23 15:08:34 2012 -0700
committer Ying Wang <wangying@google.com> Thu Aug 23 15:08:34 2012 -0700
tree 730dba2cd03485d6d48323e54172da096348d826
parent f8c154f4b0b402968a911bf2c00ea40d252ccb60

Filter out the overridden packages before doing required module expansion.

Bug: 6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index eda80ed..a71359d 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -603,6 +603,9 @@
   # by the appropriate product definition file, which was included
   # by product_config.make.
   product_MODULES := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES)
+  # Filter out the overridden packages before doing expansion
+  product_MODULES := $(filter-out $(foreach p, $(product_MODULES), \
+      $(PACKAGES.$(p).OVERRIDES)), $(product_MODULES))
   $(call expand-required-modules,product_MODULES,$(product_MODULES))
   product_FILES := $(call module-installed-files, $(product_MODULES))
   ifeq (0,1)