Changes zip filtering of the test APK to use the last jar before dexing from the binary_under_test. This prevents the filter from removing classes that are identical in the deploy jars but are proguarded differently.

--
MOS_MIGRATED_REVID=95325114

2 files changed, 9 insertions, 9 deletions

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 e3fa06fcf1..c69f814a14 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
@@ -494,7 +494,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
         .add(ApkProvider.class,
             new ApkProvider(NestedSetBuilder.create(Order.STABLE_ORDER, zipAlignedApk),
                 coverageMetadata))
-        .add(AndroidDeployJarProvider.class, new AndroidDeployJarProvider(deployJar))
+        .add(AndroidPreDexJarProvider.class, new AndroidPreDexJarProvider(jarToDex))
         .addOutputGroup("mobile_install_full", fullDeployMarker)
         .addOutputGroup("mobile_install_incremental", incrementalDeployMarker)
         .addOutputGroup("mobile_install_split", splitOutputGroup);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeployJarProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidPreDexJarProvider.java
index c69bd636a6..02a2438e00 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeployJarProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidPreDexJarProvider.java
@@ -18,22 +18,22 @@ import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 
 /**
- * A provider for targets that build _deploy.jar files.
+ * A provider of the final Jar to be dexed for targets that build APKs.
  */
 @Immutable
-public final class AndroidDeployJarProvider implements TransitiveInfoProvider {
+public final class AndroidPreDexJarProvider implements TransitiveInfoProvider {
 
-  private final Artifact deployJar;
+  private final Artifact preDexJar;
 
 
-  public AndroidDeployJarProvider(Artifact deployJar) {
-    this.deployJar = deployJar;
+  public AndroidPreDexJarProvider(Artifact preDexJar) {
+    this.preDexJar = preDexJar;
   }
 
   /**
-   * Returns the deploy jar.
+   * Returns the jar to be dexed.
    */
-  public Artifact getDeployJar() {
-    return deployJar;
+  public Artifact getPreDexJar() {
+    return preDexJar;
   }
 }