diff options
| author |  tomlu <tomlu@google.com> | 2017-09-11 22:25:33 +0200 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-09-12 14:05:28 +0200 |
| commit | bb50580a7f3eb3f4e7c5fba8e92d20e931591a70 (patch) | |
| tree | 26b0b3b0e1dcac29980476b38f8ca99a320a6061 /src/main/java/com/google/devtools/build/lib/rules/proto | |
| parent | d24f3cbfc0b3102aaf550a282f26bc9c1ba073bf (diff) | |
Inline CustomCommandLine methods that can be expressed using VectorArg.
This whole CL was done using IDE refactoring tools and should be safe.
PiperOrigin-RevId: 168275575
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/proto')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java | 12 |
1 files changed, 7 insertions, 5 deletions
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 89a9577600..265b7d6e31 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 @@ -35,6 +35,7 @@ import com.google.devtools.build.lib.analysis.MakeVariableExpander; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; +import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.VectorArg; import com.google.devtools.build.lib.analysis.actions.FileWriteAction; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.cmdline.Label; @@ -560,14 +561,15 @@ public class ProtoCompileActionBuilder { CustomCommandLine.Builder commandLine, @Nullable NestedSet<Artifact> protosInDirectDependencies, NestedSet<Artifact> transitiveImports) { - commandLine.addAll(transitiveImports, ProtoCompileActionBuilder::transitiveImportArg); + commandLine.addAll( + VectorArg.of(transitiveImports).mapped(ProtoCompileActionBuilder::transitiveImportArg)); if (protosInDirectDependencies != null) { if (!protosInDirectDependencies.isEmpty()) { - commandLine.addJoined( + commandLine.addAll( "--direct_dependencies", - ":", - protosInDirectDependencies, - ProtoCompileActionBuilder::getPathIgnoringRepository); + VectorArg.join(":") + .each(protosInDirectDependencies) + .mapped(ProtoCompileActionBuilder::getPathIgnoringRepository)); } else { // The proto compiler requires an empty list to turn on strict deps checking commandLine.add("--direct_dependencies="); |