diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
3 files changed, 3 insertions, 19 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java index 562ee8703a..26e9fd2218 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java @@ -61,7 +61,7 @@ public class BazelProtoLibrary implements RuleConfiguredTargetFactory { RuleConfiguredTargetBuilder result = new RuleConfiguredTargetBuilder(ruleContext); Artifact descriptorSetOutput = null; - if (checkDepsProtoSources.isEmpty() || !outputDescriptorSetFlagEnabled(ruleContext)) { + if (checkDepsProtoSources.isEmpty()) { result.setFilesToBuild(NestedSetBuilder.<Artifact>create(STABLE_ORDER)); } else { descriptorSetOutput = @@ -97,11 +97,4 @@ public class BazelProtoLibrary implements RuleConfiguredTargetFactory { .addSkylarkTransitiveInfo(ProtoSourcesProvider.SKYLARK_NAME, sourcesProvider) .build(); } - - private boolean outputDescriptorSetFlagEnabled(RuleContext ruleContext) { - return ruleContext - .getConfiguration() - .getFragment(ProtoConfiguration.class) - .outputDescriptorSet(); - } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java index f080c37ddd..6ffcc729b3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java @@ -122,7 +122,7 @@ public class ProtoConfiguration extends Fragment { name = "output_descriptor_set", defaultValue = "true", category = "experimental", - help = "When true, a proto_library will produce a descriptor set proto in its outputs." + help = "ignored." ) public boolean outputDescriptorSet; @@ -137,7 +137,6 @@ public class ProtoConfiguration extends Fragment { host.protoToolchainForJavaLite = protoToolchainForJavaLite; host.protoToolchainForCc = protoToolchainForCc; host.strictProtoDeps = strictProtoDeps; - host.outputDescriptorSet = outputDescriptorSet; return host; } } @@ -170,7 +169,6 @@ public class ProtoConfiguration extends Fragment { private final Label protoToolchainForJavaLite; private final Label protoToolchainForCc; private final StrictDepsMode strictProtoDeps; - private final boolean outputDescriptorSet; public ProtoConfiguration(Options options) { this.experimentalProtoExtraActions = options.experimentalProtoExtraActions; @@ -180,7 +178,6 @@ public class ProtoConfiguration extends Fragment { this.protoToolchainForJavaLite = options.protoToolchainForJavaLite; this.protoToolchainForCc = options.protoToolchainForCc; this.strictProtoDeps = options.strictProtoDeps; - this.outputDescriptorSet = options.outputDescriptorSet; } public ImmutableList<String> protocOpts() { @@ -215,8 +212,4 @@ public class ProtoConfiguration extends Fragment { public StrictDepsMode strictProtoDeps() { return strictProtoDeps; } - - public boolean outputDescriptorSet() { - return outputDescriptorSet; - } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoSourcesProvider.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoSourcesProvider.java index 93d9f91f39..5b5039b9dc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoSourcesProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoSourcesProvider.java @@ -108,9 +108,7 @@ public abstract class ProtoSourcesProvider implements TransitiveInfoProvider { */ @SkylarkCallable( name = "descriptor_set", - doc = - "The FileDescriptorSet of all transitive sources. Returns None if " - + "--output_descriptor_set isn't enabled or if there are no sources", + doc = "The FileDescriptorSet of all transitive sources.", structField = true, allowReturnNones = true ) |