am e1770f5f: am 9c649a75: Don\'t install overridden packages in pdk fusion files.
* commit 'e1770f5fc85eccc7124cd2effb634baa308851eb':
Don't install overridden packages in pdk fusion files.
diff --git a/core/Makefile b/core/Makefile
index 9580504..512258d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -691,13 +691,17 @@
# -----------------------------------------------------------------
# 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