commit 79d09f7fae477dbdd57a79ec406e159c588155eb
author Adam Michael <ajmichael@google.com> Wed Nov 30 04:12:27 2016 +0000
committer Irina Iancu <elenairina@google.com> Wed Nov 30 08:07:50 2016 +0000
tree 722314aa3a4c23b6d11a364c4f8a512e6394cd1a
parent 1f4ee384922f63b3132cb98a6bc950b3fe65e8ca

--experimental_android_use_singlejar_for_multidex compresses classes*.dex

Currently, setting this flag on a native multidex build results in classes*.dex being stored in the APK uncompressed which is certainly not good.

--
MOS_MIGRATED_REVID=140561305

src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index 834b1e1..e77b66a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -1566,6 +1566,7 @@
     if (ruleContext.getFragment(AndroidConfiguration.class).useSingleJarForMultidex()) {
       ruleContext.registerAction(singleJarSpawnActionBuilder(ruleContext)
           .addArgument("--exclude_build_data")
+          .addArgument("--dont_change_compression")
           .addArgument("--sources")
           .addInputArgument(inputZip)
           .addArgument("--output")