Description redacted.

--
PiperOrigin-RevId: 151407958
MOS_MIGRATED_REVID=151407958

4 files changed, 4 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java
index ecc8400a33..3ddcf58760 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java
@@ -51,8 +51,7 @@ public class BazelAndroidSemantics implements AndroidSemantics {
       RuleConfiguredTargetBuilder builder,
       RuleContext ruleContext,
       JavaCommon javaCommon,
-      AndroidCommon androidCommon,
-      Artifact jarWithAllClasses) {}
+      AndroidCommon androidCommon) {}
 
   @Override
   public ApplicationManifest getManifestForRule(RuleContext ruleContext) throws RuleErrorException {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index 040f60635e..9ae24818b7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -799,8 +799,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
 
     androidCommon.addTransitiveInfoProviders(
         builder, androidSemantics, null /* aar */, resourceApk, zipAlignedApk, apksUnderTest);
-    androidSemantics.addTransitiveInfoProviders(
-        builder, ruleContext, javaCommon, androidCommon, jarToDex);
+    androidSemantics.addTransitiveInfoProviders(builder, ruleContext, javaCommon, androidCommon);
 
     if (proguardOutput.getMapping() != null) {
       builder.add(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
index ef4ff5295b..1f5e1a62b7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
@@ -195,8 +195,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
     RuleConfiguredTargetBuilder builder = new RuleConfiguredTargetBuilder(ruleContext);
     androidCommon.addTransitiveInfoProviders(builder, androidSemantics, aarOut,
         resourceApk, null, ImmutableList.<Artifact>of());
-    androidSemantics.addTransitiveInfoProviders(
-        builder, ruleContext, javaCommon, androidCommon, null);
+    androidSemantics.addTransitiveInfoProviders(builder, ruleContext, javaCommon, androidCommon);
 
     NestedSetBuilder<Artifact> transitiveResourcesJars = collectTransitiveResourceJars(ruleContext);
     if (androidCommon.getResourceClassJar() != null) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java
index c433715bfa..377e80e0bb 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java
@@ -48,8 +48,7 @@ public interface AndroidSemantics {
       RuleConfiguredTargetBuilder builder,
       RuleContext ruleContext,
       JavaCommon javaCommon,
-      AndroidCommon androidCommon,
-      Artifact jarWithAllClasses)
+      AndroidCommon androidCommon)
       throws InterruptedException;
 
   /**