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/objc/CompilationSupport.java | |
| 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/objc/CompilationSupport.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index b787ebcaf5..cf15e6082f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java @@ -55,6 +55,7 @@ import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.actions.CommandLine; 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.ParameterFileWriteAction; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; @@ -1105,12 +1106,16 @@ public abstract class CompilationSupport { .addExecPath("--output_archive", prunedJ2ObjcArchive) .addExecPath("--dummy_archive", dummyArchive) .addExecPath("--xcrunwrapper", xcrunwrapper(ruleContext).getExecutable()) - .addJoinedExecPaths("--dependency_mapping_files", ",", j2ObjcDependencyMappingFiles) - .addJoinedExecPaths("--header_mapping_files", ",", j2ObjcHeaderMappingFiles) - .addJoinedExecPaths( - "--archive_source_mapping_files", ",", j2ObjcArchiveSourceMappingFiles) + .addExecPaths( + "--dependency_mapping_files", + VectorArg.join(",").each(j2ObjcDependencyMappingFiles)) + .addExecPaths( + "--header_mapping_files", VectorArg.join(",").each(j2ObjcHeaderMappingFiles)) + .addExecPaths( + "--archive_source_mapping_files", + VectorArg.join(",").each(j2ObjcArchiveSourceMappingFiles)) .add("--entry_classes") - .addJoined(",", entryClasses) + .addAll(VectorArg.join(",").each(entryClasses)) .build(); ruleContext.registerAction( |