diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-06-30 10:09:56 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-07-01 23:04:36 -0700 |
| commit | fca814550c9375ed1fb03703b21a9e4fdd06f236 (patch) | |
| tree | a07613fe012853c4eb89e2253e2952b47309e96b | |
| parent | 4b539d1533a5d8647e5f54b0a41b2a49d7f4c785 (diff) | |
| download | build-fca814550c9375ed1fb03703b21a9e4fdd06f236.zip build-fca814550c9375ed1fb03703b21a9e4fdd06f236.tar.gz build-fca814550c9375ed1fb03703b21a9e4fdd06f236.tar.bz2 | |
Strip all multidex files, not just classes.dex
Bug: 10447095
Change-Id: I6053ca97cb0e28621262a385d57c0996e7c1aaab
| -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 ab970f9..76fc130 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 |