commit 7b923862c5d8d16c84c50dd1a3b8c6584b729b21
author ilist <ilist@google.com> Thu Dec 23 05:45:38 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Dec 23 05:46:59 2021 -0800
tree 5479d745276c380760f6bccb50942df0fd3ff6b7
parent b9544d0bdb2e3515328bb571d5c2ad871f0fe9c3

Use literals for format flags in proto_common call.

This should save some memory allocations.

PiperOrigin-RevId: 417993342

src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
index f6083b1..8a0a1fb 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
@@ -66,11 +66,12 @@
   private final ProtoInfo protoInfo;
   private final FilesToRunProvider protoCompiler;
   private final String progressMessage;
-  private final String langPrefix;
   private final Iterable<Artifact> outputs;
   private Iterable<Artifact> inputs;
   private FilesToRunProvider langPlugin;
+  private String langPluginFormat;
   private Supplier<String> langPluginParameter;
+  private String langPluginParameterFormat;
   private boolean hasServices;
   private Iterable<String> additionalCommandLineArguments;
   private Iterable<FilesToRunProvider> additionalTools;
@@ -87,8 +88,10 @@
     return this;
   }
 
-  public ProtoCompileActionBuilder setLangPlugin(FilesToRunProvider langPlugin) {
+  public ProtoCompileActionBuilder setLangPlugin(
+      FilesToRunProvider langPlugin, String langPluginFormat) {
     this.langPlugin = langPlugin;
+    this.langPluginFormat = langPluginFormat;
     return this;
   }
 
@@ -97,8 +100,10 @@
     return this;
   }
 
-  public ProtoCompileActionBuilder setLangPluginParameter(Supplier<String> langPluginParameter) {
+  public ProtoCompileActionBuilder setLangPluginParameter(
+      Supplier<String> langPluginParameter, String langPluginParameterFormat) {
     this.langPluginParameter = langPluginParameter;
+    this.langPluginParameterFormat = langPluginParameterFormat;
     return this;
   }
 
@@ -123,12 +128,10 @@
       ProtoInfo protoInfo,
       FilesToRunProvider protoCompiler,
       String progressMessage,
-      String langPrefix,
       Iterable<Artifact> outputs) {
     this.protoInfo = protoInfo;
     this.protoCompiler = protoCompiler;
     this.progressMessage = progressMessage;
-    this.langPrefix = langPrefix;
     this.outputs = outputs;
     this.mnemonic = DEFAULT_MNEMONIC;
   }
@@ -172,14 +175,11 @@
     if (langPlugin != null && langPlugin.getExecutable() != null) {
       // We pass a separate langPlugin as there are plugins that cannot be overridden
       // and thus we have to deal with "$xx_plugin" and "xx_plugin".
-      additionalArgs.add(
-          Tuple.of(
-              langPlugin.getExecutable(), String.format("--plugin=protoc-gen-%s=%%s", langPrefix)));
+      additionalArgs.add(Tuple.of(langPlugin.getExecutable(), langPluginFormat));
     }
 
     if (langPluginParameter != null) {
-      additionalArgs.add(
-          Tuple.of(langPluginParameter.get(), String.format("--%s_out=%%s", langPrefix)));
+      additionalArgs.add(Tuple.of(langPluginParameter.get(), langPluginParameterFormat));
     }
 
     if (!hasServices) {