am 2d39468b: Merge "Filter out the overridden packages before doing required module expansion." into jb-mr1-dev

* commit '2d39468bee1b2ab1f26e8da9cc0849cab86349ad':
  Filter out the overridden packages before doing required module expansion.
This commit is contained in:
Ying Wang 2012-08-24 09:53:47 -07:00 committed by Android Git Automerger
commit 4084c112e5

View file

@ -603,6 +603,9 @@ ifdef FULL_BUILD
# by the appropriate product definition file, which was included # by the appropriate product definition file, which was included
# by product_config.make. # by product_config.make.
product_MODULES := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES) 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)) $(call expand-required-modules,product_MODULES,$(product_MODULES))
product_FILES := $(call module-installed-files, $(product_MODULES)) product_FILES := $(call module-installed-files, $(product_MODULES))
ifeq (0,1) ifeq (0,1)