From 9c649a7542ee3fda57a1836ad0ddcd8d19921f5b Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Wed, 8 Aug 2012 15:27:00 -0700 Subject: [PATCH] Don't install overridden packages in pdk fusion files. Bug: 6942063 Change-Id: I14fc25b22b13bceeea8fa48491465233b19ab106 --- core/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 9580504ca..512258d6f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -691,13 +691,17 @@ endif # ----------------------------------------------------------------- # system image # +# Remove overridden packages from $(ALL_PDK_FUSION_FILES) +PDK_FUSION_SYSIMG_FILES := \ + $(filter-out $(foreach p,$(overridden_packages),$(p) %/$(p).apk), \ + $(ALL_PDK_FUSION_FILES)) INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \ $(ALL_PREBUILT) \ $(ALL_COPIED_HEADERS) \ $(ALL_GENERATED_SOURCES) \ $(ALL_DEFAULT_INSTALLED_MODULES)\ - $(ALL_PDK_FUSION_FILES)) + $(PDK_FUSION_SYSIMG_FILES)) ifdef is_tests_build # We don't want to install tests modules to the system partition -- 2.11.0