Open source dex merging tools for incremental dexing.

Tested with
bazel build --incremental_dexing_binary_types=monodex,multidex_unsharded,multidex_sharded -- //examples/android/java/bazel:hello_world

--
MOS_MIGRATED_REVID=134690103

1 files changed, 2 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java
index e263edca8a..08df8a2ea7 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java
@@ -62,6 +62,8 @@ public class AndroidSdkRepositoryRule implements RuleDefinition {
           builder.put("android/palette_v7", Label.parseAbsoluteUnchecked(prefix + "palette_v7"));
           builder.put(
               "android/recyclerview_v7", Label.parseAbsoluteUnchecked(prefix + "recyclerview_v7"));
+          builder.put(
+              "android/dx_jar_import", Label.parseAbsoluteUnchecked(prefix + "dx_jar_import"));
           return builder.build();
         }
       };