Automated rollback of commit f384ab5855ba230e7767b7b5350bd72ef01b9a1b.

*** Reason for rollback ***

Memory regression (b/79331026)

*** Original change description ***

Some fixup for R.class files

Expose R.class file in AndroidResourcesInfo, to allow Java compilation.

Include documentation that the R.class should not be used in other targets.

Actually generate the R.class file in the case of an android_library with no
manifest, resources, or assets, rather than compiling it from the R.java

RELNOTES: none
PiperOrigin-RevId: 195659672

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 264804ef7a..09ac5afbb3 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
@@ -276,14 +276,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)
@@ -316,15 +314,14 @@ public final class ResourceDependencies {
    * @return A provider with the current resources and label.
    */
   public AndroidResourcesInfo toInfo(
-      Label label, ProcessedAndroidManifest manifest, Artifact rTxt, 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,