commit fd0307a2cc7019b360f77033a7f7465e103a61af
author Carmi Grushko <carmi@google.com> Mon May 23 11:46:23 2016 +0000
committer Yue Gan <yueg@google.com> Mon May 23 13:10:13 2016 +0000
tree 4cd7eaac2df28ed52c6f0db06af360c2230209bc
parent 7777e6f68ceb1b616292567b71b402c95de59e80

JavaLibraryHelper: when collecting transitive source jars, look in the targets that were added using addDeps(), instead of looking in the "deps" attribute.

This is currently a no-op, because collectTransitiveJavaSourceJars() is only called if noProviders() hasn't been called, which never happens in the current code in Blaze.

--
MOS_MIGRATED_REVID=122985812

src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java
index 969ce07..0be4319 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java
@@ -19,7 +19,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.Runfiles;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
@@ -331,9 +330,11 @@
     NestedSetBuilder<Artifact> transitiveJavaSourceJarBuilder =
         NestedSetBuilder.<Artifact>stableOrder();
     transitiveJavaSourceJarBuilder.addAll(sourceJars);
-    for (JavaSourceJarsProvider other : ruleContext.getPrerequisites(
-        "deps", Mode.TARGET, JavaSourceJarsProvider.class)) {
-      transitiveJavaSourceJarBuilder.addTransitive(other.getTransitiveSourceJars());
+    for (TransitiveInfoCollection dep : deps) {
+      JavaSourceJarsProvider provider = dep.getProvider(JavaSourceJarsProvider.class);
+      if (provider != null) {
+        transitiveJavaSourceJarBuilder.addTransitive(provider.getTransitiveSourceJars());
+      }
     }
     return transitiveJavaSourceJarBuilder.build();
   }