Changes the android rules to invoke jarjar directly instead of through a script.

--
MOS_MIGRATED_REVID=94791363

1 files changed, 4 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
index f859fc47e7..4513454242 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
@@ -498,8 +498,10 @@ public final class AndroidRuleClasses {
               .value(env.getLabel("//tools/defaults:android_jar")))
           .add(attr("$android_dx_jar", LABEL).cfg(HOST)
               .value(env.getLabel("//tools/defaults:android_dx_jar")))
-          .add(attr("$android_jar_repackager", LABEL).cfg(HOST).exec()
-              .value(env.getLabel("//tools/android:repackage_jar")))
+          // TODO(ahumesky): It would be better to put this dependency in //tools/android somehow
+          // like all the rest of android tools.
+          .add(attr("$jarjar_bin", LABEL).cfg(HOST).exec()
+              .value(env.getLabel("//third_party/java/jarjar:jarjar_bin")))
           .build();
     }