Expose R.class as a JavaInfo

The R.class file, when available, is used in Java compilation. So it should be
exposed in its own provider as an output of resource processing.

The R.class file is marked as Neverlink and compiletime-only to ensure it
doesn't get inherited.

Change resource processing to return a SkylarkDict of providers. That way,
callers can easily get the provider they want, or use values() to get all the
providers.

Stop exposing R.class in AndroidResourcesInfo since we're exposing it in an
easier-to-consume way now.

Will update other methods that return multiple providers to do the same in
future reviews.

RELNOTES: none
PiperOrigin-RevId: 195871587

1 files changed, 3 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceDependencies.java b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceDependencies.java
index 1631db5992..0a62aea8d2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceDependencies.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceDependencies.java
@@ -254,14 +254,12 @@ public final class ResourceDependencies {
           .toInfo(
               newDirectResource.getLabel(),
               newDirectResource.getProcessedManifest(),
-              newDirectResource.getRTxt(),
-              newDirectResource.getJavaClassJar());
+              newDirectResource.getRTxt());
     }
     return new AndroidResourcesInfo(
         newDirectResource.getLabel(),
         newDirectResource.getProcessedManifest(),
         newDirectResource.getRTxt(),
-        newDirectResource.getJavaClassJar(),
         NestedSetBuilder.<ValidatedAndroidData>naiveLinkOrder()
             .addTransitive(transitiveResourceContainers)
             .addTransitive(directResourceContainers)
@@ -294,15 +292,14 @@ public final class ResourceDependencies {
    * @return A provider with the current resources and label.
    */
   public AndroidResourcesInfo toInfo(
-      Label label, ProcessedAndroidManifest manifest, Artifact rTxt, @Nullable Artifact rClassJar) {
+      Label label, ProcessedAndroidManifest manifest, Artifact rTxt) {
     if (neverlink) {
-      return ResourceDependencies.empty().toInfo(label, manifest, rTxt, rClassJar);
+      return ResourceDependencies.empty().toInfo(label, manifest, rTxt);
     }
     return new AndroidResourcesInfo(
         label,
         manifest,
         rTxt,
-        rClassJar,
         transitiveResourceContainers,
         directResourceContainers,
         transitiveResources,