Skip to content

Commit

Permalink
Remove the gen_jars output group
Browse files Browse the repository at this point in the history
RELNOTES: Removed the gen_jars output group
PiperOrigin-RevId: 206092599
  • Loading branch information
cushon authored and Copybara-Service committed Jul 26, 2018
1 parent 2143ff2 commit 75810d5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
Expand Up @@ -700,13 +700,7 @@ public void addGenJarsProvider(
activePlugins, activePlugins,
getDependencies(JavaGenJarsProvider.class)); getDependencies(JavaGenJarsProvider.class));


NestedSetBuilder<Artifact> genJarsBuilder = NestedSetBuilder.stableOrder(); builder.addProvider(JavaGenJarsProvider.class, genJarsProvider);
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); javaInfoBuilder.addProvider(JavaGenJarsProvider.class, genJarsProvider);
} }
Expand Down
Expand Up @@ -132,13 +132,6 @@ static LabelLateBoundDefault<JavaConfiguration> javaToolchainAttribute(
String SOURCE_JARS_OUTPUT_GROUP = String SOURCE_JARS_OUTPUT_GROUP =
OutputGroupInfo.HIDDEN_OUTPUT_GROUP_PREFIX + "source_jars"; 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. */ /** Implementation for the :jvm attribute. */
static LabelLateBoundDefault<JavaConfiguration> jvmAttribute(RuleDefinitionEnvironment env) { static LabelLateBoundDefault<JavaConfiguration> jvmAttribute(RuleDefinitionEnvironment env) {
return LabelLateBoundDefault.fromTargetConfiguration( return LabelLateBoundDefault.fromTargetConfiguration(
Expand Down

0 comments on commit 75810d5

Please sign in to comment.