From 84da5c55dd4b5dd7925f91864582a616422251e2 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Thu, 23 Aug 2012 15:08:34 -0700
Subject: [PATCH] Filter out the overridden packages before doing required
 module expansion.

Bug: 6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
---
 core/main.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/main.mk b/core/main.mk
index b9c40dfda..5cbaeaa6d 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -593,6 +593,9 @@ ifdef FULL_BUILD
   # 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)