Adds a provider that exports Java source information. Adds some testing support for Aspects.
--
MOS_MIGRATED_REVID=93547419
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 8891b27..85c2664 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -931,6 +931,24 @@
}
/**
+ * For a configured target dependentTarget, returns the desired configured target
+ * that is depended upon. Useful for obtaining the a target with aspects
+ * required by the dependent.
+ */
+ @VisibleForTesting
+ public ConfiguredTarget getPrerequisiteConfiguredTargetForTesting(
+ ConfiguredTarget dependentTarget, ConfiguredTarget desiredTarget) {
+ Collection<ConfiguredTarget> configuredTargets =
+ getPrerequisiteMapForTesting(dependentTarget).values();
+ for (ConfiguredTarget ct : configuredTargets) {
+ if (ct.getLabel().equals(desiredTarget.getLabel())) {
+ return ct;
+ }
+ }
+ return null;
+ }
+
+ /**
* Tests and clears the current thread's pending "interrupted" status, and
* throws InterruptedException iff it was set.
*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
index 2eabf3f..8183db2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
@@ -27,6 +27,7 @@
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
+import com.google.devtools.build.lib.collect.nestedset.Order;
import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory;
import com.google.devtools.build.lib.rules.cpp.CcLinkParams;
import com.google.devtools.build.lib.rules.cpp.CcLinkParamsProvider;
@@ -127,6 +128,8 @@
.add(JavaNativeLibraryProvider.class, new JavaNativeLibraryProvider(
transitiveJavaNativeLibraries))
.add(CppCompilationContext.class, transitiveCppDeps)
+ .add(JavaSourceInfoProvider.class, new JavaSourceInfoProvider(
+ NestedSetBuilder.wrap(Order.STABLE_ORDER, srcJars), /* Artifact bundledSrcJar = */null))
.add(JavaSourceJarsProvider.class, new JavaSourceJarsProvider(
transitiveJavaSourceJars, srcJars))
.addOutputGroup(JavaSemantics.SOURCE_JARS_OUTPUT_GROUP, transitiveJavaSourceJars)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
index 326ac31..4400888 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
@@ -210,6 +210,9 @@
ruleContext, common, ImmutableList.<String>of(), classJar, srcJar, gensrcJar,
ImmutableMap.<Artifact, Artifact>of(), helper, filesBuilder, builder);
+ NestedSetBuilder<Artifact> sourceInfoBuilder = NestedSetBuilder.stableOrder();
+ sourceInfoBuilder.addAll(attributes.getSourceFiles()).addAll(attributes.getSourceJars());
+
NestedSet<Artifact> filesToBuild = filesBuilder.build();
common.addTransitiveInfoProviders(builder, filesToBuild, classJar);
@@ -224,6 +227,8 @@
.add(CcLinkParamsProvider.class, new CcLinkParamsProvider(ccLinkParamsStore))
.add(JavaNativeLibraryProvider.class, new JavaNativeLibraryProvider(
transitiveJavaNativeLibraries))
+ .add(JavaSourceInfoProvider.class, new JavaSourceInfoProvider(
+ sourceInfoBuilder.build(), srcJar))
.add(JavaSourceJarsProvider.class, new JavaSourceJarsProvider(
transitiveSourceJars, ImmutableList.of(srcJar)))
// TODO(bazel-team): this should only happen for java_plugin
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSourceInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSourceInfoProvider.java
new file mode 100644
index 0000000..7a906f7
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSourceInfoProvider.java
@@ -0,0 +1,56 @@
+// Copyright 2015 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.lib.rules.java;
+
+import com.google.common.base.Preconditions;
+import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
+import com.google.devtools.build.lib.collect.nestedset.NestedSet;
+import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
+
+/**
+ * A Provider describing the java sources directly belonging to a java rule.
+ */
+@Immutable
+public final class JavaSourceInfoProvider implements TransitiveInfoProvider {
+
+ private final NestedSet<Artifact> sources;
+ private final Artifact bundledSrcJar;
+
+ public JavaSourceInfoProvider(NestedSet<Artifact> sources, Artifact bundledSrcJar) {
+ Preconditions.checkNotNull(sources);
+ this.sources = sources;
+ this.bundledSrcJar = bundledSrcJar;
+ }
+
+ /**
+ * Gets the source artifacts. They will be .java, .jar, or .srcjar
+ * files. These files must be the original Java sources,
+ * and must not include the bundled .jar artifact generated by those sources.
+ * The .jars and .srcjars should contain java sources, but may include other files also.
+ * @return the source artifacts for this JavaSourceInfoProvider.
+ */
+ public NestedSet<Artifact> getSources() {
+ return sources;
+ }
+
+ /**
+ * Gets the srcjar artifact created by bundling the sources in getSources().
+ * If the rule that created this provider does not create a bundled source jar, returns null.
+ * @return the created srcjar artifact
+ */
+ public Artifact getBundledSrcJar() {
+ return bundledSrcJar;
+ }
+}
