Automated rollback of commit f43df1e29765f75e02838e4139417e914b3ee812.

*** Reason for rollback ***

Breaks external cc_proto_library. See https://github.com/bazelbuild/bazel/issues/4780
RELNOTES: None.

*** Original change description ***

Fixing issue with external j2objc protos

PiperOrigin-RevId: 188041921

5 files changed, 18 insertions, 158 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
index 54393cb212..a86bdda6dc 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
@@ -183,7 +183,7 @@ public class ProtoCommon {
     ArtifactRoot genfiles =
         ruleContext.getConfiguration().getGenfilesDirectory(ruleContext.getRule().getRepository());
     for (Artifact src : protoSources) {
-      PathFragment srcPath = getPathIgnoringRepository(src);
+      PathFragment srcPath = src.getRootRelativePath();
       if (pythonNames) {
         srcPath = srcPath.replaceName(srcPath.getBaseName().replace('-', '_'));
       }
@@ -251,18 +251,4 @@ public class ProtoCommon {
     }
     return (flagValue == BuildConfiguration.StrictDepsMode.STRICT);
   }
-
-  /**
-   * Gets the artifact's path relative to the root, ignoring the external repository the artifact is
-   * at. For example, <code>
-   * //a:b.proto --> a/b.proto
-   * {@literal @}foo//a:b.proto --> a/b.proto
-   * </code>
-   */
-  public static PathFragment getPathIgnoringRepository(Artifact artifact) {
-    return artifact
-        .getRootRelativePath()
-        .relativeTo(
-            artifact.getOwnerLabel().getPackageIdentifier().getRepository().getPathUnderExecRoot());
-  }
 }
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
index c0767acdf0..6fdcc040f0 100644
--- 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
@@ -611,15 +611,26 @@ public class ProtoCompileActionBuilder {
   }
 
   private static void expandTransitiveImportArg(Artifact artifact, Consumer<String> args) {
-    args.accept(
-        "-I"
-            + ProtoCommon.getPathIgnoringRepository(artifact).toString()
-            + "="
-            + artifact.getExecPathString());
+    args.accept("-I" + getPathIgnoringRepository(artifact) + "=" + artifact.getExecPathString());
   }
 
   private static void expandToPathIgnoringRepository(Artifact artifact, Consumer<String> args) {
-    args.accept(ProtoCommon.getPathIgnoringRepository(artifact).toString());
+    args.accept(getPathIgnoringRepository(artifact));
+  }
+
+  /**
+   * Gets the artifact's path relative to the root, ignoring the external repository the artifact is
+   * at. For example, <code>
+   * //a:b.proto --> a/b.proto
+   * {@literal @}foo//a:b.proto --> a/b.proto
+   * </code>
+   */
+  private static String getPathIgnoringRepository(Artifact artifact) {
+    return artifact
+        .getRootRelativePath()
+        .relativeTo(
+            artifact.getOwnerLabel().getPackageIdentifier().getRepository().getPathUnderExecRoot())
+        .toString();
   }
 
   /**
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index c197c10d91..c7d819a0ee 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -1336,21 +1336,6 @@ java_test(
 )
 
 java_test(
-    name = "ProtoCommonTest",
-    srcs = ["rules/proto/ProtoCommonTest.java"],
-    deps = [
-        ":actions_testutil",
-        ":analysis_testutil",
-        "//src/main/java/com/google/devtools/build/lib:proto-rules",
-        "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/java/com/google/devtools/build/lib/cmdline",
-        "//src/main/java/com/google/devtools/build/lib/vfs",
-        "//src/test/java/com/google/devtools/build/lib:testutil",
-        "//third_party:truth",
-    ],
-)
-
-java_test(
     name = "ProtoCompileActionBuilderTest",
     srcs = ["rules/proto/ProtoCompileActionBuilderTest.java"],
     deps = [
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
index 45f55abe31..6a72c21ef9 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
@@ -47,7 +47,6 @@ import com.google.devtools.build.lib.rules.cpp.CppCompileActionTemplate;
 import com.google.devtools.build.lib.rules.cpp.CppModuleMapAction;
 import com.google.devtools.build.lib.rules.cpp.UmbrellaHeaderAction;
 import com.google.devtools.build.lib.testutil.TestConstants;
-import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.io.ByteArrayOutputStream;
 import java.util.List;
@@ -278,50 +277,6 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
   }
 
   @Test
-  public void testJavaProtoLibraryWithProtoLibrary_external() throws Exception {
-    scratch.file("/bla/WORKSPACE");
-    // Create the rule '@bla//foo:test_proto'.
-    scratch.file(
-        "/bla/foo/BUILD",
-        "package(default_visibility=['//visibility:public'])",
-        j2ObjcCompatibleProtoLibrary("    name = 'test_proto',", "    srcs = ['test.proto'],"),
-        "java_proto_library(",
-        "    name = 'test_java_proto',",
-        "    deps = [':test_proto'])",
-        "");
-
-    String existingWorkspace =
-        new String(FileSystemUtils.readContentAsLatin1(rootDirectory.getRelative("WORKSPACE")));
-    scratch.overwriteFile(
-        "WORKSPACE", "local_repository(name = 'bla', path = '/bla/')", existingWorkspace);
-    invalidatePackages(); // A dash of magic to re-evaluate the WORKSPACE file.
-
-    scratch.file(
-        "x/BUILD",
-        "",
-        "java_library(",
-        "    name = 'test',",
-        "    srcs = ['test.java'],",
-        "    deps = ['@bla//foo:test_java_proto'])");
-
-    ConfiguredTarget target = getJ2ObjCAspectConfiguredTarget("//x:test");
-    ConfiguredTarget test =
-        getConfiguredTarget("@bla//foo:test_proto", getAppleCrosstoolConfiguration());
-
-    J2ObjcMappingFileProvider provider = target.getProvider(J2ObjcMappingFileProvider.class);
-
-    Artifact classMappingFile = getGenfilesArtifact("test.clsmap.properties", test);
-    assertThat(provider.getClassMappingFiles()).containsExactly(classMappingFile);
-
-    ObjcProvider objcProvider = target.get(ObjcProvider.SKYLARK_CONSTRUCTOR);
-
-    Artifact headerFile = getGenfilesArtifact("test.j2objc.pb.h", test);
-    Artifact sourceFile = getGenfilesArtifact("test.j2objc.pb.m", test);
-    assertThat(objcProvider.get(ObjcProvider.HEADER)).contains(headerFile);
-    assertThat(objcProvider.get(ObjcProvider.SOURCE)).contains(sourceFile);
-  }
-
-  @Test
   public void testJ2ObjcInfoExportedInJavaImport() throws Exception {
     scratch.file("java/com/google/transpile/BUILD",
         "java_import(name = 'dummy',",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCommonTest.java
deleted file mode 100644
index 808bb53966..0000000000
--- a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCommonTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2018 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.devtools.build.lib.rules.proto;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.ArtifactRoot;
-import com.google.devtools.build.lib.actions.util.LabelArtifactOwner;
-import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
-import com.google.devtools.build.lib.cmdline.PackageIdentifier;
-import com.google.devtools.build.lib.cmdline.RepositoryName;
-import com.google.devtools.build.lib.testutil.Scratch;
-import com.google.devtools.build.lib.vfs.Path;
-import com.google.devtools.build.lib.vfs.PathFragment;
-import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Unit tests for {@link ProtoCommon}.
- */
-@RunWith(JUnit4.class)
-public class ProtoCommonTest {
-
-  private Scratch scratch;
-  private Path execDir;
-  private ArtifactRoot rootDir;
-
-  @Before
-  public final void setRootDir() throws Exception {
-    scratch = new Scratch();
-    execDir = scratch.dir("/exec");
-    rootDir = ArtifactRoot.asDerivedRoot(execDir, scratch.dir("/exec/root"));
-  }
-
-  @Test
-  public void getPathIgnoringRepository_main() throws IOException, LabelSyntaxException {
-    Path f1 = scratch.file("/exec/root/foo/bar");
-
-    PackageIdentifier ownerPackage =
-        PackageIdentifier.create(RepositoryName.MAIN, PathFragment.create("//foo"));
-
-    LabelArtifactOwner owner = new LabelArtifactOwner(Label.create(ownerPackage, "owner_a"));
-    Artifact a1 = new Artifact(rootDir, f1.relativeTo(execDir), owner);
-    PathFragment pathIgnoringRepository = ProtoCommon.getPathIgnoringRepository(a1);
-    assertThat(pathIgnoringRepository).isEqualTo(PathFragment.create("foo/bar"));
-  }
-
-  @Test
-  public void getPathIgnoringRepository_external() throws IOException, LabelSyntaxException {
-    Path f1 = scratch.file("/exec/root/external/repo_a/foo/bar");
-
-    PackageIdentifier ownerPackage =
-        PackageIdentifier.create("@repo_a", PathFragment.create("//foo"));
-
-    LabelArtifactOwner owner = new LabelArtifactOwner(Label.create(ownerPackage, "owner_a"));
-    Artifact a1 = new Artifact(rootDir, f1.relativeTo(execDir), owner);
-    PathFragment pathIgnoringRepository = ProtoCommon.getPathIgnoringRepository(a1);
-    assertThat(pathIgnoringRepository).isEqualTo(PathFragment.create("foo/bar"));
-  }
-}