commit ba3c00765cbbac41c08bd1c91b06baa61e1fcc81
author Brian Carlstrom <bdc@google.com> Wed Jul 02 23:13:32 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 02 23:13:32 2014 +0000
tree 7488f45a8bf83e935b78986b2de837989a83798c
parent f50459c6e5021bdfa84bd297d5d209e8153dbf93
parent 3be473bdb5297094bb48a10b8b388e1071ed999e

am 3be473bd: am 97609d7f: am 7b53bca0: Merge "Strip all multidex files, not just classes.dex"

* commit '3be473bdb5297094bb48a10b8b388e1071ed999e':
  Strip all multidex files, not just classes.dex

core/dex_preopt.mk

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 @@
 
 # $(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