RELNOTES: Easier import paths for j2objc headers.
--
MOS_MIGRATED_REVID=93641405
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 8183db2..5e59311 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
@@ -129,7 +129,7 @@
transitiveJavaNativeLibraries))
.add(CppCompilationContext.class, transitiveCppDeps)
.add(JavaSourceInfoProvider.class, new JavaSourceInfoProvider(
- NestedSetBuilder.wrap(Order.STABLE_ORDER, srcJars), /* Artifact bundledSrcJar = */null))
+ NestedSetBuilder.wrap(Order.STABLE_ORDER, srcJars)))
.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 4400888..8df9711d 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
@@ -227,8 +227,7 @@
.add(CcLinkParamsProvider.class, new CcLinkParamsProvider(ccLinkParamsStore))
.add(JavaNativeLibraryProvider.class, new JavaNativeLibraryProvider(
transitiveJavaNativeLibraries))
- .add(JavaSourceInfoProvider.class, new JavaSourceInfoProvider(
- sourceInfoBuilder.build(), srcJar))
+ .add(JavaSourceInfoProvider.class, new JavaSourceInfoProvider(sourceInfoBuilder.build()))
.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
index 7a906f7..5125571 100644
--- 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
@@ -26,31 +26,19 @@
public final class JavaSourceInfoProvider implements TransitiveInfoProvider {
private final NestedSet<Artifact> sources;
- private final Artifact bundledSrcJar;
- public JavaSourceInfoProvider(NestedSet<Artifact> sources, Artifact bundledSrcJar) {
+ public JavaSourceInfoProvider(NestedSet<Artifact> sources) {
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.
+ * Gets the original Java source artifacts, which may be .java, source .jar, or .srcjar files.
* The .jars and .srcjars should contain java sources, but may include other files also.
- * @return the source artifacts for this JavaSourceInfoProvider.
+ *
+ * @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;
- }
}
