Forward fix for broken ProtoLangToolchainTest

PiperOrigin-RevId: 971349260
Change-Id: I7ee83b38962e915aa66214ddbc88c226a4bd809a

src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConstants.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConstants.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConstants.java
index 05ce547..bb5c614 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConstants.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConstants.java
@@ -43,6 +43,10 @@
   /** Default label for proto compiler.*/
   public static final String DEFAULT_PROTOC_LABEL =  "@bazel_tools//tools/proto:protoc";
 
+  /** Default label for proto compiler in third_party. */
+  public static final String DEFAULT_PROTOC_LABEL_THIRD_PARTY =
+      "external/com_google_protobuf+/protoc";
+
   /** Default label for java proto toolchains. */
   static final String DEFAULT_JAVA_PROTO_LABEL = "@bazel_tools//tools/proto:java_toolchain";
 

src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java
index 9c55609..b0facaa 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java
@@ -53,8 +53,8 @@
     assertThat(toolchain.mnemonic()).isEqualTo("MyMnemonic");
   }
 
-  private void validateProtoCompiler(ProtoLangToolchainProvider toolchain, String protocLabel)
-      throws Exception {
+  private void validateProtoCompilerByLabel(
+      ProtoLangToolchainProvider toolchain, String protocLabel) throws Exception {
     Label actualProtocLabel = getConfiguredTarget(protocLabel).getActual().getLabel();
     assertThat(toolchain.protoc().getExecutable().prettyPrint())
         .isEqualTo(
@@ -65,6 +65,11 @@
                 .getPathString());
   }
 
+  private void validateProtoCompilerDirectly(ProtoLangToolchainProvider toolchain, String expected)
+      throws Exception {
+    assertThat(toolchain.protoc().getExecutable().prettyPrint()).isEqualTo(expected);
+  }
+
   @Test
   public void protoToolchain() throws Exception {
     scratch.file(
@@ -126,7 +131,7 @@
         ProtoLangToolchainProvider.get(getConfiguredTarget("//foo:toolchain"));
 
     validateProtoLangToolchain(toolchain);
-    validateProtoCompiler(toolchain, ProtoConstants.DEFAULT_PROTOC_LABEL);
+    validateProtoCompilerDirectly(toolchain, ProtoConstants.DEFAULT_PROTOC_LABEL_THIRD_PARTY);
   }
 
   @Test
@@ -190,7 +195,7 @@
         ProtoLangToolchainProvider.get(getConfiguredTarget("//foo:toolchain"));
 
     validateProtoLangToolchain(toolchain);
-    validateProtoCompiler(toolchain, ProtoConstants.DEFAULT_PROTOC_LABEL);
+    validateProtoCompilerByLabel(toolchain, ProtoConstants.DEFAULT_PROTOC_LABEL);
   }
 
   @Test
@@ -224,7 +229,7 @@
         ProtoLangToolchainProvider.get(getConfiguredTarget("//foo:toolchain"));
 
     validateProtoLangToolchain(toolchain);
-    validateProtoCompiler(toolchain, ProtoConstants.DEFAULT_PROTOC_LABEL);
+    validateProtoCompilerDirectly(toolchain, ProtoConstants.DEFAULT_PROTOC_LABEL_THIRD_PARTY);
   }
 
   @Test
@@ -258,7 +263,7 @@
         ProtoLangToolchainProvider.get(getConfiguredTarget("//foo:toolchain"));
 
     validateProtoLangToolchain(toolchain);
-    validateProtoCompiler(toolchain, ProtoConstants.DEFAULT_PROTOC_LABEL);
+    validateProtoCompilerDirectly(toolchain, ProtoConstants.DEFAULT_PROTOC_LABEL_THIRD_PARTY);
   }
 
   @Test