diff options
author | Googler <noreply@google.com> | 2015-06-05 21:40:00 +0000 |
---|---|---|
committer | Laurent Le Brun <laurentlb@google.com> | 2015-06-08 12:53:40 +0000 |
commit | 37e59a778dc385748e8b5e644cf4abc5b7877412 (patch) | |
tree | bcdce1a2ce2cf75caf0defdddc90b9e706fe1553 /src/main/java | |
parent | b848770dc8ea25946e0d3f738b7925d0beeb2a9e (diff) |
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
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidPreDexJarProvider.java (renamed from src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeployJarProvider.java) | 16 |
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; } } |