aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@google.com>2015-03-20 22:16:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 22:16:57 +0000
commitc3200dd4d40f0be05cd0f8d7dcd555e4b709117e (patch)
tree61750ac8a3562f3cff279ec667b07b1f82a4eae9
parentb9a5e3a6815d0e821cb5d2a8f997a31182e9c121 (diff)
parent3f04bf35f490a4e03ccf0701358d6f759d71edef (diff)
downloadsdk-c3200dd4d40f0be05cd0f8d7dcd555e4b709117e.zip
sdk-c3200dd4d40f0be05cd0f8d7dcd555e4b709117e.tar.gz
sdk-c3200dd4d40f0be05cd0f8d7dcd555e4b709117e.tar.bz2
am 3f04bf35: am f005a74c: Merge "Don\'t compress apks." into idea133 automerge: b6d2791
* commit '3f04bf35f490a4e03ccf0701358d6f759d71edef': Don't compress apks.
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java
index 867e39d..c451195 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java
@@ -914,6 +914,10 @@ public class BuildHelper {
commandArray.add(configFilter);
}
+ // never compress apks.
+ commandArray.add("-0");
+ commandArray.add("apk");
+
commandArray.add("-M"); //$NON-NLS-1$
commandArray.add(osManifestPath);