diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/ResourceDependencies.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/ResourceDependencies.java | 9 |
1 files changed, 6 insertions, 3 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..264804ef7a 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,12 +276,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 +316,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, 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, |