aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@google.com>2014-07-21 22:40:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-21 22:40:47 +0000
commit3f04bf35f490a4e03ccf0701358d6f759d71edef (patch)
tree545200207a63f5bba1404e799044297f47347f45
parent9c57d0c307673d8ec2763dd22d01b45347a98d50 (diff)
parentf005a74c1b5cc7d98838eb59bbe6eea009925671 (diff)
downloadsdk-3f04bf35f490a4e03ccf0701358d6f759d71edef.zip
sdk-3f04bf35f490a4e03ccf0701358d6f759d71edef.tar.gz
sdk-3f04bf35f490a4e03ccf0701358d6f759d71edef.tar.bz2
am f005a74c: Merge "Don\'t compress apks." into idea133 automerge: b6d2791
* commit 'f005a74c1b5cc7d98838eb59bbe6eea009925671': 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);