Inline --output_descriptor_set=true.

--
PiperOrigin-RevId: 146284737
MOS_MIGRATED_REVID=146284737

1 files changed, 1 insertions, 8 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();
-  }
 }