diff options
author | tomlu <tomlu@google.com> | 2018-03-01 17:16:23 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-01 17:18:38 -0800 |
commit | b85365174c20c2616d85507e31e3b2422e0cbf48 (patch) | |
tree | 99f30073e4f44467db8a83e293a075fa3cf24d8a /src/test/java/com/google/devtools/build/lib | |
parent | f090082d62c3ea779d2dd33eb0fd7355b0ee9456 (diff) |
Make JavaCompileAction and friends emit new-style arguments.
Instead of --direct_dependency, --indirect_dependency args we now emit --direct_dependencies. We no longer need to emit any jar owner information since that is baked into the jar by JavaBuilder.
This CL also contains the deletion of CustomMultiArgv and the injecting_rule_kind aspect parameter, as the deleted code was the last remaining usage.
RELNOTES: None
PiperOrigin-RevId: 187558628
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java b/src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java index b9f341a588..022ecdd124 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java @@ -23,7 +23,6 @@ import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact; import com.google.devtools.build.lib.actions.Artifact.SpecialArtifactType; import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; -import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.CustomMultiArgv; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.VectorArg; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.NestedSet; @@ -813,21 +812,6 @@ public class CustomCommandLineTest { } @Test - public void testCustomMultiArgs() { - CustomCommandLine cl = - builder() - .addCustomMultiArgv( - new CustomMultiArgv() { - @Override - public ImmutableList<String> argv() { - return ImmutableList.of("--arg1", "--arg2"); - } - }) - .build(); - assertThat(cl.arguments()).containsExactly("--arg1", "--arg2").inOrder(); - } - - @Test public void testCombinedArgs() { CustomCommandLine cl = builder() @@ -891,7 +875,6 @@ public class CustomCommandLineTest { .addExecPaths("foo", NestedSetBuilder.emptySet(Order.STABLE_ORDER)) .addAll("foo", VectorArg.of((NestedSet<String>) null)) .addAll("foo", VectorArg.of(NestedSetBuilder.<String>emptySet(Order.STABLE_ORDER))) - .addCustomMultiArgv(null) .addPlaceholderTreeArtifactExecPath("foo", null) .build(); assertThat(cl.arguments()).isEmpty(); |