Automated rollback of commit 15b27e46ad766e777fb898f39bff06efa9268c2a. Keep the usage of Streams in place. Keep the test in place, updated it with the new expected values. Only removed the neverlink filter. RELNOTES: none. PiperOrigin-RevId: 206951071
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java index 4ff6468..a286b87 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java
@@ -529,7 +529,6 @@ NestedSetBuilder<Artifact> transitiveSourceJars = NestedSetBuilder.<Artifact>stableOrder().addAll(outputSourceJars); Stream.concat(deps.stream(), exports.stream()) - .filter(javaInfo -> !javaInfo.isNeverlink()) .filter(javaInfo -> javaInfo.getProvider(JavaSourceJarsProvider.class) != null) .map(javaInfo -> javaInfo.getProvider(JavaSourceJarsProvider.class)) .forEach(
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java index 109787b..f49c9b1 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
@@ -2010,7 +2010,8 @@ JavaInfo info = configuredTarget.get(JavaInfo.PROVIDER); assertThat(artifactFilesNames(info.getTransitiveRuntimeJars().toCollection(Artifact.class))) .containsExactly("liba.jar"); - assertThat(artifactFilesNames(info.getTransitiveSourceJars())).containsExactly("liba-src.jar"); + assertThat(artifactFilesNames(info.getTransitiveSourceJars())) + .containsExactly("liba-src.jar", "libb-src.jar"); assertThat(artifactFilesNames(info.getTransitiveCompileTimeJars().toCollection(Artifact.class))) .containsExactly("liba-hjar.jar", "libb-hjar.jar"); }