diff options
| author |  cushon <cushon@google.com> | 2018-08-02 07:55:02 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-02 07:56:25 -0700 |
| commit | 237a57ae388788b1695020f50a258a678e2cbd16 (patch) | |
| tree | 0952215cb87be69aa6285e90bc029658faa35157 /src/main/java/com/google/devtools/build/lib/rules | |
| parent | f621bbe84e8c2bff47d8d060f28be2a8b5bae834 (diff) | |
BEGIN_PUBLIC
Internal change
END_PUBLIC
Automated rollback of commit 81a2dddbcfd4a9c7ea9c664195f2f44ae8abeb55.
*** Reason for rollback ***
fix forward
*** Original change description ***
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: 207099489
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
| -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, 1 insertions, 14 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 8ce42f4b26..5f2fc13bdd 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 @@ -718,13 +718,7 @@ public class JavaCommon { activePlugins, getDependencies(JavaGenJarsProvider.class)); - 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()); + builder.addProvider(JavaGenJarsProvider.class, genJarsProvider); 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 292e5d37ee..2d5e1c76f1 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,13 +132,6 @@ 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( |