diff options
| author |  ajmichael <ajmichael@google.com> | 2018-01-18 10:59:28 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-18 11:01:20 -0800 |
| commit | 710b9a3af0c1432ed288fe02c8205b645a3e4d52 (patch) | |
| tree | c11780bb769a22f27b952581e15ea5e699cc676b /src/main/java/com/google/devtools | |
| parent | 659974ed5e1fbd2122efc98ed7e1a0e3d5e59472 (diff) | |
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
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java | 5 |
1 files changed, 4 insertions, 1 deletions
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<TransitiveInfoCollection> targets = - ImmutableList.copyOf(ruleContext.getPrerequisites("exports", Mode.TARGET)); + ImmutableList.<TransitiveInfoCollection>builder() + .addAll(ruleContext.getPrerequisites("exports", Mode.TARGET)) + .addAll(ruleContext.getPrerequisites("deps", Mode.TARGET)) + .build(); JavaCommon common = new JavaCommon( ruleContext, |