diff options
| author |  ajmichael <ajmichael@google.com> | 2017-04-10 18:33:40 +0000 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-04-11 10:50:12 +0200 |
| commit | 010b1fcf5d3b805d268adc33c9abb5ee2c466bbf (patch) | |
| tree | 0c00d7c24abb37987b15aeb352be47de4907594a /src/main/java/com/google/devtools/build/lib/rules | |
| parent | 219af1a02aed0110f471aa07a2e7e2680e2b96b5 (diff) | |
Support multidex in Bazel.
Previously multidex did not work in Bazel because it required a dependency on
zip, which we do not ship with Bazel. Then the
--experimental_android_use_singlejar_for_multidex flag was added to use a
different tool that is included with Bazel for multidex. This change sets that
flag to be the default.
Fixes https://github.com/bazelbuild/bazel/issues/1936
RELNOTES: android_binary multidex should now work without additional flags.
PiperOrigin-RevId: 152712301
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java index 0c9b7fe75c..37d3bc36a7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java @@ -396,7 +396,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { public boolean useSingleJarApkBuilder; @Option(name = "experimental_android_use_singlejar_for_multidex", - defaultValue = "false", + defaultValue = "true", category = "undocumented", help = "Use SingleJar for multidex dex extraction.") public boolean useSingleJarForMultidex; |