am e1770f5f: am 9c649a75: Don\'t install overridden packages in pdk fusion files.

* commit 'e1770f5fc85eccc7124cd2effb634baa308851eb':
  Don't install overridden packages in pdk fusion files.
This commit is contained in:
Ying Wang 2012-08-08 15:42:06 -07:00 committed by Android Git Automerger
commit 58a3051c84
1 changed files with 5 additions and 1 deletions

View File

@ -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