diff options
| author | Ying Wang <wangying@google.com> | 2012-08-08 15:27:00 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-08-08 15:36:43 -0700 |
| commit | 9c649a7542ee3fda57a1836ad0ddcd8d19921f5b (patch) | |
| tree | 88115a499755193f8d47cda96e662924496286a3 | |
| parent | b0cc9aae50089f0b77d6adc74f4d6027f0316b52 (diff) | |
| download | build-9c649a7542ee3fda57a1836ad0ddcd8d19921f5b.zip build-9c649a7542ee3fda57a1836ad0ddcd8d19921f5b.tar.gz build-9c649a7542ee3fda57a1836ad0ddcd8d19921f5b.tar.bz2 | |
Don't install overridden packages in pdk fusion files.
Bug: 6942063
Change-Id: I14fc25b22b13bceeea8fa48491465233b19ab106
| -rw-r--r-- | core/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index 9580504..512258d 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 |