diff options
| author |  twerth <twerth@google.com> | 2018-08-01 06:34:29 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-01 06:36:04 -0700 |
| commit | 81a2dddbcfd4a9c7ea9c664195f2f44ae8abeb55 (patch) | |
| tree | bb1f3db26d3064656b5461d5e6234ac7e342ca10 | |
| parent | c82c39e0e42e51286bbc5098bd7131753513e92b (diff) | |
Automated rollback of commit 75810d5910073aa7a1550bbd36544971f3c95ae1.
*** Reason for rollback ***
[]
*** Original change description ***
Remove the gen_jars output group
RELNOTES: Removed the gen_jars output group
PiperOrigin-RevId: 206921241
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java | 8 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java index 7da5b33810..e2768b27ff 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java @@ -720,7 +720,13 @@ public class JavaCommon { activePlugins, getDependencies(JavaGenJarsProvider.class)); - builder.addProvider(JavaGenJarsProvider.class, genJarsProvider); + NestedSetBuilder<Artifact> genJarsBuilder = NestedSetBuilder.stableOrder(); + genJarsBuilder.addTransitive(genJarsProvider.getTransitiveGenClassJars()); + genJarsBuilder.addTransitive(genJarsProvider.getTransitiveGenSourceJars()); + + builder + .addProvider(JavaGenJarsProvider.class, genJarsProvider) + .addOutputGroup(JavaSemantics.GENERATED_JARS_OUTPUT_GROUP, genJarsBuilder.build()); javaInfoBuilder.addProvider(JavaGenJarsProvider.class, genJarsProvider); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java index 2d5e1c76f1..292e5d37ee 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java @@ -132,6 +132,13 @@ public interface JavaSemantics { String SOURCE_JARS_OUTPUT_GROUP = OutputGroupInfo.HIDDEN_OUTPUT_GROUP_PREFIX + "source_jars"; + /** + * Name of the output group used for gen jars (the jars containing the class files for sources + * generated from annotation processors). + */ + String GENERATED_JARS_OUTPUT_GROUP = + OutputGroupInfo.HIDDEN_OUTPUT_GROUP_PREFIX + "gen_jars"; + /** Implementation for the :jvm attribute. */ static LabelLateBoundDefault<JavaConfiguration> jvmAttribute(RuleDefinitionEnvironment env) { return LabelLateBoundDefault.fromTargetConfiguration( |