Automated g4 rollback of commit bcd2355.

*** Reason for rollback *** RELNOTES: None PiperOrigin-RevId: 154315543
bazelbuild · Apr 26, 2017 · 496d3de · 496d3de
1 parent 3d4db19
commit 496d3de
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 25 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
@@ -586,7 +586,7 @@ static CustomCommandLine createCommandLineFromToolchains(
     }
 
     for (Artifact src : protosToCompile) {
-      cmdLine.addPath(src.getExecPath());
+      cmdLine.addPath(src.getRootRelativePath());
     }
 
     if (!allowServices) {

diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java
@@ -105,30 +105,6 @@ public void commandLine_basic() throws Exception {
         .inOrder();
   }
 
-  @Test
-  public void commandline_derivedArtifact() {
-    // Verify that the command line contains the correct path to a generated protocol buffers.
-    SupportData supportData =
-        SupportData.create(
-            Predicates.<TransitiveInfoCollection>alwaysFalse(),
-            ImmutableList.of(derivedArtifact("//:dont-care", "source_file.proto")),
-            NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* protosInDirectDeps */,
-            NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* transitiveImports */,
-            true /* hasProtoSources */);
-
-    CustomCommandLine cmdLine =
-        createCommandLineFromToolchains(
-            ImmutableList.<ToolchainInvocation>of() /* toolchainInvocations */,
-            supportData.getDirectProtoSources(),
-            supportData.getTransitiveImports(),
-            null /* protosInDirectDeps */,
-            "//foo:bar",
-            true /* allowServices */,
-            ImmutableList.<String>of() /* protocOpts */);
-
-    assertThat(cmdLine.arguments()).containsExactly("out/source_file.proto");
-  }
-
   @Test
   public void commandLine_strictDeps() throws Exception {
     ProtoLangToolchainProvider toolchain =