diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-07-02 16:35:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-01 23:33:34 +0000 |
| commit | 7b53bca0b925bc9f47b51afba14c3c8f064eae81 (patch) | |
| tree | cadc7de315bf3a2dae9236aa6088155e27a692f4 | |
| parent | cc80f5a1ff4a8b751e36b7d1d5a3670f6ec12ba0 (diff) | |
| parent | fca814550c9375ed1fb03703b21a9e4fdd06f236 (diff) | |
| download | build-7b53bca0b925bc9f47b51afba14c3c8f064eae81.tar.gz | |
Merge "Strip all multidex files, not just classes.dex"
| -rw-r--r-- | core/dex_preopt.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index ab970f917a..76fc130f74 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -18,7 +18,11 @@ DEXPREOPT_BOOT_JAR_DIR_FULL_PATH := $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)/$(DEXPREO # $(1): the .jar or .apk to remove classes.dex define dexpreopt-remove-classes.dex -$(hide) $(AAPT) remove $(1) classes.dex +$(hide) zip --quiet --delete $(1) classes.dex; \ +dex_index=2; \ +while zip --quiet --delete $(1) classes$${dex_index}.dex > /dev/null; do \ + let dex_index=dex_index+1; \ +done endef # Special rules for building stripped boot jars that override java_library.mk rules |