From 710b9a3af0c1432ed288fe02c8205b645a3e4d52 Mon Sep 17 00:00:00 2001 From: ajmichael Date: Thu, 18 Jan 2018 10:59:28 -0800 Subject: Fix aar_import.deps to propagate jars. Previously, aar_import.deps only worked for resource files and aar_import.exports worked for both resource files and Java. Now, aar_import.deps works for both as well with the same semantics as exports. This is not ideal, but it is how java_import.deps currently works. Fixes https://github.com/bazelbuild/bazel/issues/4472 RELNOTES: None PiperOrigin-RevId: 182405741 --- .../java/com/google/devtools/build/lib/rules/android/AarImport.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java b/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java index 9617d95063..950f7edebf 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java @@ -122,7 +122,10 @@ public class AarImport implements RuleConfiguredTargetFactory { } ImmutableList targets = - ImmutableList.copyOf(ruleContext.getPrerequisites("exports", Mode.TARGET)); + ImmutableList.builder() + .addAll(ruleContext.getPrerequisites("exports", Mode.TARGET)) + .addAll(ruleContext.getPrerequisites("deps", Mode.TARGET)) + .build(); JavaCommon common = new JavaCommon( ruleContext, -- cgit v1.2.3