1 files changed, 6 insertions, 25 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 09ac5afbb3..1631db5992 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
@@ -137,28 +137,6 @@ public final class ResourceDependencies {
         transitiveRTxt.build());
   }
 
-  static ResourceDependencies wrapManifestInfo(Label label, AndroidManifestInfo manifestInfo) {
-    return new ResourceDependencies(
-        false,
-        NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER),
-        NestedSetBuilder.create(
-            Order.NAIVE_LINK_ORDER,
-            ResourceContainer.builder()
-                .setManifest(manifestInfo.getManifest())
-                .setJavaPackage(manifestInfo.getPackage())
-                .setManifestExported(manifestInfo.exportsManifest())
-                .setLabel(label)
-                .build()),
-        NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER),
-        NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER),
-        NestedSetBuilder.create(Order.NAIVE_LINK_ORDER, manifestInfo.getManifest()),
-        NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER),
-        NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER),
-        NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER),
-        NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER),
-        NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER));
-  }
-
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
@@ -276,12 +254,14 @@ public final class ResourceDependencies {
           .toInfo(
               newDirectResource.getLabel(),
               newDirectResource.getProcessedManifest(),
-              newDirectResource.getRTxt());
+              newDirectResource.getRTxt(),
+              newDirectResource.getJavaClassJar());
     }
     return new AndroidResourcesInfo(
         newDirectResource.getLabel(),
         newDirectResource.getProcessedManifest(),
         newDirectResource.getRTxt(),
+        newDirectResource.getJavaClassJar(),
         NestedSetBuilder.<ValidatedAndroidData>naiveLinkOrder()
             .addTransitive(transitiveResourceContainers)
             .addTransitive(directResourceContainers)
@@ -314,14 +294,15 @@ public final class ResourceDependencies {
    * @return A provider with the current resources and label.
    */
   public AndroidResourcesInfo toInfo(
-      Label label, ProcessedAndroidManifest manifest, Artifact rTxt) {
+      Label label, ProcessedAndroidManifest manifest, Artifact rTxt, @Nullable Artifact rClassJar) {
     if (neverlink) {
-      return ResourceDependencies.empty().toInfo(label, manifest, rTxt);
+      return ResourceDependencies.empty().toInfo(label, manifest, rTxt, rClassJar);
     }
     return new AndroidResourcesInfo(
         label,
         manifest,
         rTxt,
+        rClassJar,
         transitiveResourceContainers,
         directResourceContainers,
         transitiveResources,