Improves flag handling.

--
MOS_MIGRATED_REVID=124848977

1 files changed, 11 insertions, 24 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java
index 79be67af49..115f1a66e6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoSupport.java
@@ -480,30 +480,17 @@ final class ProtoSupport {
   }
 
   private CustomCommandLine getProtobufCommandLine() {
-    CustomCommandLine.Builder commandLineBuilder =
-        new CustomCommandLine.Builder()
-            .add(attributes.getProtoCompiler().getExecPathString())
-            .add("--input-file-list")
-            .add(getProtoInputListFile().getExecPathString())
-            .add("--output-dir")
-            .add(getWorkspaceRelativeOutputDir().getSafePathString())
-            .add("--force")
-            .add("--proto-root-dir")
-            .add(".");
-
-    boolean configAdded = false;
-    for (Artifact portableProtoFilter : getPortableProtoFilters()) {
-      String configFlag;
-      if (!configAdded) {
-        configFlag = "--config";
-        configAdded = true;
-      } else {
-        configFlag = "--extra-filter-config";
-      }
-
-      commandLineBuilder.add(configFlag).add(portableProtoFilter.getExecPathString());
-    }
-    return commandLineBuilder.build();
+    return new CustomCommandLine.Builder()
+        .add(attributes.getProtoCompiler().getExecPathString())
+        .add("--input-file-list")
+        .add(getProtoInputListFile().getExecPathString())
+        .add("--output-dir")
+        .add(getWorkspaceRelativeOutputDir().getSafePathString())
+        .add("--force")
+        .add("--proto-root-dir")
+        .add(".")
+        .addBeforeEachExecPath("--config", getPortableProtoFilters())
+        .build();
   }
 
   private ImmutableList<Artifact> generatedOutputArtifacts(FileType newFileType) {