diff options
| author |  tomlu <tomlu@google.com> | 2018-06-02 09:34:06 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-02 09:35:13 -0700 |
| commit | 452141ffc66a3cbd27c597001585ade4251a307f (patch) | |
| tree | 09d42b162e63e178ffbdd6ee834e3fb346350563 /src/main | |
| parent | 360ed3f6b81305387f9f6dddd8cd6ef3ffddac86 (diff) | |
Automated rollback of commit c4e128e2c6d8cacaeba034d6a3195796d50f1745.
Always generating source jars can lead to action conflicts.
RELNOTES: None
PiperOrigin-RevId: 198994272
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java | 10 |
1 files changed, 8 insertions, 2 deletions
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 0037212924..e5c2cde4a3 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 @@ -483,7 +483,13 @@ final class JavaInfoBuildHelper { JavaRuleOutputJarsProvider.Builder outputJarsBuilder = JavaRuleOutputJarsProvider.builder(); - Artifact outputSourceJar = getSourceJar(skylarkRuleContext.getRuleContext(), outputJar); + boolean generateMergedSourceJar = + (sourceJars.size() > 1 || !sourceFiles.isEmpty()) + || (sourceJars.isEmpty() && sourceFiles.isEmpty() && !exports.isEmpty()); + Artifact outputSourceJar = + generateMergedSourceJar + ? getSourceJar(skylarkRuleContext.getRuleContext(), outputJar) + : sourceJars.get(0); JavaInfo.Builder javaInfoBuilder = JavaInfo.Builder.create(); JavaCompilationArtifacts artifacts = @@ -493,7 +499,7 @@ final class JavaInfoBuildHelper { javaRuntimeInfo, SkylarkList.createImmutable(ImmutableList.of()), outputJarsBuilder, - /*createOutputSourceJar=*/ true, + /*createOutputSourceJar*/ generateMergedSourceJar, outputSourceJar, javaInfoBuilder); |