diff options
| author | Ying Wang <wangying@google.com> | 2013-02-25 16:02:42 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-02-25 16:58:05 -0800 |
| commit | f7084ca9218b35b41523d7fb0926a8773ecf2ef4 (patch) | |
| tree | 819e8901f8b41a338a24edeb806b34213ccfc089 /core/package.mk | |
| parent | 48b6e18f1f27ca57c89879c00fae516243231354 (diff) | |
| download | build-f7084ca9218b35b41523d7fb0926a8773ecf2ef4.zip build-f7084ca9218b35b41523d7fb0926a8773ecf2ef4.tar.gz build-f7084ca9218b35b41523d7fb0926a8773ecf2ef4.tar.bz2 | |
Run zipalign after classes.dex is removed from the apk
If LOCAL_DEX_PREOPT is enabled.
Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
Diffstat (limited to 'core/package.mk')
| -rw-r--r-- | core/package.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/package.mk b/core/package.mk index c0bc7d8..3a8e43a 100644 --- a/core/package.mk +++ b/core/package.mk @@ -421,15 +421,17 @@ ifneq ($(extra_jar_args),) $(add-java-resources-to-package) endif $(sign-package) - @# Alignment must happen after all other zip operations. - $(align-package) ifdef LOCAL_DEX_PREOPT $(hide) rm -f $(patsubst %.apk,%.odex,$@) $(call dexpreopt-one-file,$@,$(patsubst %.apk,%.odex,$@)) ifneq (nostripping,$(LOCAL_DEX_PREOPT)) $(call dexpreopt-remove-classes.dex,$@) endif +endif + @# Alignment must happen after all other zip operations. + $(align-package) +ifdef LOCAL_DEX_PREOPT built_odex := $(basename $(LOCAL_BUILT_MODULE)).odex $(built_odex): $(LOCAL_BUILT_MODULE) endif |