aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
index 9c899b1061..0be002e9b8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
@@ -247,7 +247,6 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
RuleConfiguredTargetBuilder builder = new RuleConfiguredTargetBuilder(ruleContext);
androidCommon.addTransitiveInfoProviders(
builder,
- androidSemantics,
aarOut,
resourceApk,
null,
@@ -257,8 +256,8 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
androidCommon.isNeverLink());
NestedSetBuilder<Artifact> transitiveResourcesJars = collectTransitiveResourceJars(ruleContext);
- if (androidCommon.getResourceClassJar() != null) {
- transitiveResourcesJars.add(androidCommon.getResourceClassJar());
+ if (resourceApk.getResourceJavaClassJar() != null) {
+ transitiveResourcesJars.add(resourceApk.getResourceJavaClassJar());
}
builder