diff options
| author | Ying Wang <wangying@google.com> | 2012-08-23 15:08:34 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-08-23 15:08:34 -0700 |
| commit | 489458fa3161ed0c299f737da68376862ce13f9f (patch) | |
| tree | 730dba2cd03485d6d48323e54172da096348d826 /core/main.mk | |
| parent | f8c154f4b0b402968a911bf2c00ea40d252ccb60 (diff) | |
| download | build-489458fa3161ed0c299f737da68376862ce13f9f.zip build-489458fa3161ed0c299f737da68376862ce13f9f.tar.gz build-489458fa3161ed0c299f737da68376862ce13f9f.tar.bz2 | |
Filter out the overridden packages before doing required module expansion.
Bug: 6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ 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) |