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/android/RClassGeneratorActionBuilder.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/android/RClassGeneratorActionBuilder.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java index 4835d09ebb..137bd653cb 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java @@ -23,6 +23,7 @@ import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType; 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.CustomCommandLine; +import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.VectorArg; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; @@ -102,9 +103,11 @@ public class RClassGeneratorActionBuilder { // TODO(corysmith): Remove NestedSet as we are already flattening it. Iterable<ResourceContainer> depResources = dependencies.getResources(); if (!Iterables.isEmpty(depResources)) { - builder.addBeforeEach( - "--library", - ImmutableList.copyOf(Iterables.transform(depResources, chooseDepsToArg(version)))); + builder.addAll( + VectorArg.addBefore("--library") + .each( + ImmutableList.copyOf( + Iterables.transform(depResources, chooseDepsToArg(version))))); inputs.addTransitive( NestedSetBuilder.wrap( Order.NAIVE_LINK_ORDER, |