diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-08-11 19:16:46 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2009-08-11 19:41:51 -0700 |
| commit | 9c0c4b7a588b3afe80dc16c133921fee991f53d3 (patch) | |
| tree | ad78176762982acfc09d96c1b03f8c0e84584e0d /core/prebuilt.mk | |
| parent | c539dbe6a2810818ac22f180e64bdc0256557532 (diff) | |
| download | build-9c0c4b7a588b3afe80dc16c133921fee991f53d3.zip build-9c0c4b7a588b3afe80dc16c133921fee991f53d3.tar.gz build-9c0c4b7a588b3afe80dc16c133921fee991f53d3.tar.bz2 | |
Fix issue #2048267: Run zipalign on all prebuilts
Diffstat (limited to 'core/prebuilt.mk')
| -rw-r--r-- | core/prebuilt.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/prebuilt.mk b/core/prebuilt.mk index 6df276c..34d2453 100644 --- a/core/prebuilt.mk +++ b/core/prebuilt.mk @@ -26,6 +26,11 @@ else prebuilt_module_is_a_library := endif +# Ensure that prebuilt .apks have been aligned. +ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),) +$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ZIPALIGN) + $(transform-prebuilt-to-target-with-zipalign) +else ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) $(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) $(transform-prebuilt-to-target-strip-comments) @@ -33,6 +38,8 @@ else $(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ACP) $(transform-prebuilt-to-target) endif +endif + ifneq ($(prebuilt_module_is_a_library),) ifneq ($(LOCAL_IS_HOST_MODULE),) $(transform-host-ranlib-copy-hack) |