diff options
author | 2017-09-28 06:35:02 -0400 | |
---|---|---|
committer | 2017-09-28 08:55:19 -0400 | |
commit | 6ee36ef239b25f66afa83e2657bd0b529b1ff50e (patch) | |
tree | 1088fca210b2f00b656f079811d338ade1af9fc3 /src/main/java/com/google/devtools/build/lib/rules/android/ApkProvider.java | |
parent | a16d16a9c95918eb1731b6122dfb169a3bd3dd03 (diff) |
Automated rollback of commit 411039319c1c67f2b9c8a7ada9e0a11d9bd4023f.
*** Reason for rollback ***
Breaks coverage for android_test (N/A).
Can be reproduced with unknown commit.
*** Original change description ***
Rollforward change of Java coverage logic.
RELNOTES: None.
*** Original change description ***
Automated rollback of commit 8d6fc64b18c7e35b93f5c43dae1dbd2f8cae2147.
PiperOrigin-RevId: 170322801
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/ApkProvider.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/ApkProvider.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApkProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApkProvider.java index 70676b701d..d265fd3160 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ApkProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApkProvider.java @@ -17,6 +17,7 @@ import com.google.auto.value.AutoValue; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; +import javax.annotation.Nullable; /** A provider for targets that produce an apk file. */ @AutoValue @@ -26,9 +27,10 @@ public abstract class ApkProvider implements TransitiveInfoProvider { public static ApkProvider create( Artifact apk, Artifact unsignedApk, + @Nullable Artifact coverageMetdata, Artifact mergedManifest, Artifact keystore) { - return new AutoValue_ApkProvider(apk, unsignedApk, mergedManifest, keystore); + return new AutoValue_ApkProvider(apk, unsignedApk, coverageMetdata, mergedManifest, keystore); } /** Returns the APK file built in the transitive closure. */ @@ -37,6 +39,10 @@ public abstract class ApkProvider implements TransitiveInfoProvider { /** Returns the unsigned APK file built in the transitive closure. */ public abstract Artifact getUnsignedApk(); + /** Returns the coverage metadata artifacts generated in the transitive closure. */ + @Nullable + public abstract Artifact getCoverageMetadata(); + /** Returns the merged manifest. */ public abstract Artifact getMergedManifest(); |