aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
diff options
context:
space:
mode:
authorGravatar elenairina <elenairina@google.com>2017-11-27 07:54:05 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2017-11-27 07:55:57 -0800
commit0dd27ab4506baced80d0cd6d135934e363598437 (patch)
treedf2f9fa7106cfc969cf68deddbe1be721eb93633 /src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
parent87f3f2dcfcd4ffbcf1ff6ecf22283ae15852831e (diff)
Automated rollback of commit a6ed4c01d374bcf98bf39c1efc12a0f4f20fe313.
*** Reason for rollback *** Breaks //javatests/com/google/devtools/intellij/blaze/plugin/aspect/java/soygenrule:SoyGenruleTest *** Original change description *** Create the output source jar in java_common.compile and expose transitive source jars to Skylark. Slightly refactor java classes to take in specific host javabase inputs and host java executable for creating the source jar, instead of always relying on fetching them from native java rules specific attributes. Creating the output source jar in java_common.compile makes the behavior more similar to java_library. Exposing the transitive_source_jars to Skylark helps with the Skylark migration fr... *** RELNOTES: None. PiperOrigin-RevId: 177015958
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
index 2392d68af5..7d87f9891d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
@@ -264,13 +264,13 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured
}
}
- JavaCompilationArtifacts artifacts = helper.build(
- javaSemantics,
- JavaCompilationHelper.getJavaToolchainProvider(ruleContext),
- JavaHelper.getHostJavabaseTarget(ruleContext),
- JavaCompilationHelper.getInstrumentationJars(ruleContext),
- JavaRuleOutputJarsProvider.builder(),
- /*outputSourceJar=*/ null);
+ JavaCompilationArtifacts artifacts =
+ helper.build(
+ javaSemantics,
+ JavaCompilationHelper.getJavaToolchainProvider(ruleContext),
+ JavaHelper.getHostJavabaseInputs(ruleContext),
+ JavaCompilationHelper.getInstrumentationJars(ruleContext),
+ JavaRuleOutputJarsProvider.builder());
return helper.buildCompilationArgsProvider(artifacts, true /* isReportedAsStrict */);
}