Remove support for ProtocolBuffers2.

PiperOrigin-RevId: 171013687

5 files changed, 67 insertions, 506 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
index 1cf1cb8c89..bde6e37421 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -57,14 +57,6 @@ public final class BazelAnalysisMock extends AnalysisMock {
         ImmutableList.of(
             "local_repository(name = 'bazel_tools', path = '" + bazelToolWorkspace + "')",
             "local_repository(name = 'local_config_xcode', path = '/local_config_xcode')",
-            "bind(",
-            "  name = 'objc_proto_lib',",
-            "  actual = '@bazel_tools//objcproto:ProtocolBuffers_lib',",
-            ")",
-            "bind(",
-            "  name = 'objc_protobuf_lib',",
-            "  actual = '@bazel_tools//objcproto:protobuf_lib',",
-            ")",
             "local_repository(name = 'com_google_protobuf', path = '/protobuf')",
             "local_repository(name = 'com_google_protobuf_java', path = '/protobuf')",
             "bind(name = 'android/sdk', actual='@bazel_tools//tools/android:sdk')",
@@ -168,10 +160,6 @@ public final class BazelAnalysisMock extends AnalysisMock {
         "/bazel_tools_workspace/objcproto/BUILD",
         "package(default_visibility=['//visibility:public'])",
         "objc_library(",
-        "  name = 'ProtocolBuffers_lib',",
-        "  srcs = ['empty.m'],",
-        ")",
-        "objc_library(",
         "  name = 'protobuf_lib',",
         "  srcs = ['empty.m'],",
         "  hdrs = ['include/header.h'],",
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java
index bc99b16aa2..43176008a5 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java
@@ -145,7 +145,8 @@ public final class MockObjcSupport {
         "  name = 'version5_8',",
         "  version = '5.8',",
         ")",
-        "objc_library(name = 'dummy_lib', srcs = ['objc_dummy.mm'])");
+        "objc_library(name = 'dummy_lib', srcs = ['objc_dummy.mm'])",
+        "alias(name = 'protobuf_lib', actual = '//objcproto:protobuf_lib')");
     // If the bazel tools repository is not in the workspace, also create a workspace tools/objc
     // package with a few lingering dependencies.
     // TODO(b/64537078): Move these dependencies underneath the tools workspace.
@@ -220,10 +221,6 @@ public final class MockObjcSupport {
         TestConstants.TOOLS_REPOSITORY_SCRATCH + "objcproto/BUILD",
         "package(default_visibility=['//visibility:public'])",
         "objc_library(",
-        "  name = 'ProtocolBuffers_lib',",
-        "  srcs = ['empty.m'],",
-        ")",
-        "objc_library(",
         "  name = 'protobuf_lib',",
         "  srcs = ['empty.m'],",
         "  hdrs = ['include/header.h'],",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcProtoLibraryTest.java
deleted file mode 100644
index c4ef886914..0000000000
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/LegacyObjcProtoLibraryTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2017 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.objc;
-
-import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Legacy test: These tests test --experimental_objc_crosstool=off. See README.
- */
-@RunWith(JUnit4.class)
-@LegacyTest
-public class LegacyObjcProtoLibraryTest extends ObjcProtoLibraryTest {
-  @Override
-  protected ObjcCrosstoolMode getObjcCrosstoolMode() {
-    return ObjcCrosstoolMode.OFF;
-  }
-
-}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspectTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspectTest.java
index ae80e06379..c19475834c 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspectTest.java
@@ -155,7 +155,6 @@ public final class ObjcProtoAspectTest extends ObjcRuleTestCase {
         "objc_proto_library(",
         "  name = 'objc_proto',",
         "  deps = [':protos'],",
-        "  uses_protobuf = 1,",
         ")");
     ConfiguredTarget topTarget = getObjcProtoAspectConfiguredTarget("//x:x");
     ObjcProtoProvider objcProtoProvider = topTarget.getProvider(ObjcProtoProvider.class);
@@ -187,7 +186,6 @@ public final class ObjcProtoAspectTest extends ObjcRuleTestCase {
         "objc_proto_library(",
         "  name = 'objc_proto_all',",
         "  deps = [':objc_proto_1', ':objc_proto_2'],",
-        "  uses_protobuf = 1,",
         ")",
         "objc_proto_library(",
         "  name = 'objc_proto_1',",
@@ -197,7 +195,6 @@ public final class ObjcProtoAspectTest extends ObjcRuleTestCase {
         "objc_proto_library(",
         "  name = 'objc_proto_2',",
         "  deps = [':protos'],",
-        "  uses_protobuf = 1,",
         ")");
     ConfiguredTarget topTarget = getObjcProtoAspectConfiguredTarget("//x:x");
     ObjcProtoProvider objcProtoProvider = topTarget.getProvider(ObjcProtoProvider.class);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java
index dc4873cd04..c2a6633ec8 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Ordering;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.CommandAction;
@@ -26,6 +27,7 @@ import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.actions.FileWriteAction;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
+import com.google.devtools.build.lib.analysis.actions.SymlinkAction;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.packages.util.MockObjcSupport;
@@ -56,7 +58,7 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
         "apple_binary(",
         "  name = 'opl_binary',",
         "  deps = [':opl_protobuf'],",
-        "  platform_type = 'tvos'",
+        "  platform_type = 'ios'",
         ")",
         "objc_library(",
         "  name = 'non_strict_lib',",
@@ -69,11 +71,6 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
         ")",
         "",
         "objc_proto_library(",
-        "  name = 'opl',",
-        "  deps = [':protolib'],",
-        ")",
-        "",
-        "objc_proto_library(",
         "  name = 'nested_opl',",
         "  deps = [':opl_protobuf'],",
         "  portable_proto_filters = ['nested_filter.txt'],",
@@ -95,10 +92,6 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
         "    'proto_filter.txt',",
         "  ],",
         ")",
-        "objc_proto_library(",
-        "  name = 'opl_well_known_types',",
-        "  deps = [':protolib_well_known_types'],",
-        ")",
         "",
         "filegroup(",
         "  name = 'portable_proto_filters',",
@@ -158,7 +151,6 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
         "  srcs = ['file_a_genfile.proto'],",
         "  deps = ['//dep:dep_lib'],",
         ")",
-        "",
         "objc_proto_library(",
         "  name = 'gen_opl',",
         "  deps = [':gen_protolib'],",
@@ -178,19 +170,6 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
 
   @Test
   public void testOutputs() throws Exception {
-    NestedSet<Artifact> filesToBuild = getFilesToBuild(getConfiguredTarget("//package:opl"));
-    assertThat(Artifact.toRootRelativePaths(filesToBuild))
-        .containsAllOf(
-            "package/libopl.a",
-            "package/_generated_protos/opl/package/FileA.pb.h",
-            "package/_generated_protos/opl/package/FileA.pb.m",
-            "package/_generated_protos/opl/package/dir/FileB.pb.h",
-            "package/_generated_protos/opl/package/dir/FileB.pb.m",
-            "package/_generated_protos/opl/dep/File.pb.h");
-  }
-
-  @Test
-  public void testOutputsProtobuf() throws Exception {
     NestedSet<Artifact> filesToBuild =
         getFilesToBuild(getConfiguredTarget("//package:opl_protobuf"));
     assertThat(Artifact.toRootRelativePaths(filesToBuild))
@@ -203,20 +182,7 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
   }
 
   @Test
-  public void testOutputsWithAutoUnionExperiment() throws Exception {
-    NestedSet<Artifact> filesToBuild = getFilesToBuild(getConfiguredTarget("//package:opl"));
-    assertThat(Artifact.toRootRelativePaths(filesToBuild))
-        .containsAllOf(
-            "package/libopl.a",
-            "package/_generated_protos/opl/package/FileA.pb.h",
-            "package/_generated_protos/opl/package/FileA.pb.m",
-            "package/_generated_protos/opl/package/dir/FileB.pb.h",
-            "package/_generated_protos/opl/package/dir/FileB.pb.m",
-            "package/_generated_protos/opl/dep/File.pb.h");
-  }
-
-  @Test
-  public void testDependingOnProtobufObjcProtoLibrary() throws Exception {
+  public void testDependingObjcProtoLibrary() throws Exception {
     NestedSet<Artifact> filesToBuild = getFilesToBuild(getConfiguredTarget("//package:nested_opl"));
     assertThat(Artifact.toRootRelativePaths(filesToBuild))
         .containsAllOf(
@@ -227,7 +193,7 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
   }
 
   @Test
-  public void testOutputsProtobufWithAutoUnionExperiment() throws Exception {
+  public void testOutputsWithAutoUnion() throws Exception {
     NestedSet<Artifact> filesToBuild =
         getFilesToBuild(getConfiguredTarget("//package:opl_protobuf"));
     assertThat(Artifact.toRootRelativePaths(filesToBuild))
@@ -242,31 +208,7 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
   }
 
   @Test
-  public void testPB2GeneratedFileNames() throws Exception {
-    NestedSet<Artifact> filesToBuild =
-        getFilesToBuild(getConfiguredTarget("//package:opl_pb2_special_names"));
-    assertThat(Artifact.toRootRelativePaths(filesToBuild))
-        .containsAllOf(
-            "package/_generated_protos/opl_pb2_special_names/package/J2ObjcDescriptor.pb.h",
-            "package/_generated_protos/opl_pb2_special_names/package/J2ObjcDescriptor.pb.m",
-            "package/_generated_protos/opl_pb2_special_names/package/Http.pb.h",
-            "package/_generated_protos/opl_pb2_special_names/package/Http.pb.m",
-            "package/_generated_protos/opl_pb2_special_names/package/Https.pb.h",
-            "package/_generated_protos/opl_pb2_special_names/package/Https.pb.m",
-            "package/_generated_protos/opl_pb2_special_names/package/SomeUrlBlah.pb.h",
-            "package/_generated_protos/opl_pb2_special_names/package/SomeUrlBlah.pb.m",
-            "package/_generated_protos/opl_pb2_special_names/package/ThumbnailUrl.pb.h",
-            "package/_generated_protos/opl_pb2_special_names/package/ThumbnailUrl.pb.m",
-            "package/_generated_protos/opl_pb2_special_names/package/Url.pb.h",
-            "package/_generated_protos/opl_pb2_special_names/package/Url.pb.m",
-            "package/_generated_protos/opl_pb2_special_names/package/Url2Https.pb.h",
-            "package/_generated_protos/opl_pb2_special_names/package/Url2Https.pb.m",
-            "package/_generated_protos/opl_pb2_special_names/package/Urlbar.pb.h",
-            "package/_generated_protos/opl_pb2_special_names/package/Urlbar.pb.m");
-  }
-
-  @Test
-  public void testProtobufGeneratedFileNames() throws Exception {
+  public void testGeneratedFileNames() throws Exception {
     NestedSet<Artifact> filesToBuild =
         getFilesToBuild(getConfiguredTarget("//package:opl_protobuf_special_names"));
     String outputPath = "package/_generated_protos/opl_protobuf_special_names/package/";
@@ -291,21 +233,7 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
   }
 
   @Test
-  public void testOutputsPB2WithWellKnownTypes() throws Exception {
-    NestedSet<Artifact> filesToBuild =
-        getFilesToBuild(getConfiguredTarget("//package:opl_well_known_types"));
-    assertThat(Artifact.toRootRelativePaths(filesToBuild))
-        .containsAllOf(
-            "package/_generated_protos/opl_well_known_types/package/FileA.pb.h",
-            "package/_generated_protos/opl_well_known_types/package/FileA.pb.m");
-    assertThat(Artifact.toRootRelativePaths(filesToBuild))
-        .containsNoneOf(
-            "package/_generated_protos/opl_well_known_types/objcproto/WellKnownType.pb.h",
-            "package/_generated_protos/opl_well_known_types/objcproto/WellKnownType.pb.m");
-  }
-
-  @Test
-  public void testOutputsProtobufWithWellKnownTypes() throws Exception {
+  public void testOutputsWithWellKnownTypes() throws Exception {
     NestedSet<Artifact> filesToBuild =
         getFilesToBuild(getConfiguredTarget("//package:opl_protobuf_well_known_types"));
     assertThat(Artifact.toRootRelativePaths(filesToBuild))
@@ -325,50 +253,14 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
     NestedSet<Artifact> filesToBuild = getFilesToBuild(getConfiguredTarget("//package:gen_opl"));
     assertThat(Artifact.toRootRelativePaths(filesToBuild))
         .containsAllOf(
-            "package/libgen_opl.a",
-            "package/_generated_protos/gen_opl/package/FileAGenfile.pb.h",
-            "package/_generated_protos/gen_opl/package/FileAGenfile.pb.m");
+            "package/_generated_protos/gen_opl/package/FileAGenfile.pbobjc.h",
+            "package/_generated_protos/gen_opl/package/FileAGenfile.pbobjc.m");
   }
 
   @Test
   public void testSourceGenerationAction() throws Exception {
     Artifact sourceFile =
         ActionsTestUtil.getFirstArtifactEndingWith(
-            getFilesToBuild(getConfiguredTarget("//package:opl")), "/FileA.pb.m");
-    SpawnAction action = (SpawnAction) getGeneratingAction(sourceFile);
-
-    Artifact inputFileList =
-        ActionsTestUtil.getFirstArtifactEndingWith(action.getInputs(), "/_proto_input_files");
-
-    ImmutableList<String> protoInputs =
-        ImmutableList.of("dep/file.proto", "package/file_a.proto", "package/dir/file_b.proto");
-
-    assertThat(action.getArguments())
-        .containsExactly(
-            "/usr/bin/python",
-            "tools/objc/compile_protos.py",
-            "--input-file-list",
-            inputFileList.getExecPathString(),
-            "--output-dir",
-            // 2x parent directory because the package has one element ("package")
-            sourceFile.getExecPath().getParentDirectory().getParentDirectory().toString(),
-            "--working-dir", ".")
-        .inOrder();
-    assertRequiresDarwin(action);
-    assertThat(Artifact.toRootRelativePaths(action.getInputs())).containsAllOf(
-        "tools/objc/compile_protos.py",
-        "tools/objc/proto_support");
-    assertThat(Artifact.toRootRelativePaths(action.getInputs())).containsAllIn(protoInputs);
-    assertThat(action.getInputs()).contains(inputFileList);
-
-    FileWriteAction inputListAction = (FileWriteAction) getGeneratingAction(inputFileList);
-    assertThat(inputListAction.getFileContents()).isEqualTo(sortedJoin(protoInputs));
-  }
-
-  @Test
-  public void testProtobufSourceGenerationAction() throws Exception {
-    Artifact sourceFile =
-        ActionsTestUtil.getFirstArtifactEndingWith(
             getFilesToBuild(getConfiguredTarget("//package:opl_protobuf")), "/FileA.pbobjc.m");
     SpawnAction action = (SpawnAction) getGeneratingAction(sourceFile);
 
@@ -413,7 +305,7 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
   }
 
   @Test
-  public void testProtobufWithWellKnownTypesProtoListInput() throws Exception {
+  public void testWellKnownTypesProtoListInput() throws Exception {
     Artifact sourceFile =
         ActionsTestUtil.getFirstArtifactEndingWith(
             getFilesToBuild(getConfiguredTarget("//package:opl_protobuf_well_known_types")),
@@ -437,46 +329,7 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
   }
 
   @Test
-  public void testUseObjcHeaders() throws Exception {
-     scratch.file("objcheaderpackage/BUILD",
-        "objc_proto_library(",
-        "  name = 'opl',",
-        "  deps = ['//package:protolib'],",
-        "  use_objc_header_names = 1,",
-        ")");
-
-    Artifact sourceFile =
-        ActionsTestUtil.getFirstArtifactEndingWith(
-            getFilesToBuild(getConfiguredTarget("//objcheaderpackage:opl")), "/FileA.pb.m");
-    SpawnAction action = (SpawnAction) getGeneratingAction(sourceFile);
-
-    assertThat(action.getArguments()).contains("--use-objc-header-names");
-
-    NestedSet<Artifact> filesToBuild =
-        getFilesToBuild(getConfiguredTarget("//objcheaderpackage:opl"));
-    assertThat(Artifact.toRootRelativePaths(filesToBuild)).containsAllOf(
-        "objcheaderpackage/_generated_protos/opl/package/FileA.pbobjc.h",
-        "objcheaderpackage/_generated_protos/opl/package/FileA.pb.m",
-        "objcheaderpackage/_generated_protos/opl/package/dir/FileB.pbobjc.h",
-        "objcheaderpackage/_generated_protos/opl/package/dir/FileB.pb.m"
-    );
-  }
-
-  @Test
-  public void testProtobufCompilationAction() throws Exception {
-    useConfiguration("--ios_cpu=i386");
-
-    ConfiguredTarget target = getConfiguredTarget("//package:opl_protobuf");
-    Artifact sourceFile =
-        ActionsTestUtil.getFirstArtifactEndingWith(getFilesToBuild(target), "/FileA.pbobjc.m");
-    SpawnAction generateAction = (SpawnAction) getGeneratingAction(sourceFile);
-
-    assertThat(generateAction).isNotNull();
-  }
-
-
-  @Test
-  public void testProtobufObjcProviderWithAutoUnionExperiment() throws Exception {
+  public void testObjcProviderWithAutoUnion() throws Exception {
     ConfiguredTarget target = getConfiguredTarget("//package:opl_protobuf");
     Artifact headerFile =
         ActionsTestUtil.getFirstArtifactEndingWith(getFilesToBuild(target), "/FileA.pbobjc.h");
@@ -492,19 +345,6 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
   }
 
   @Test
-  public void testPerProtoIncludes() throws Exception {
-    ConfiguredTarget target = getConfiguredTarget("//package:opl");
-    Artifact headerFile = ActionsTestUtil.getFirstArtifactEndingWith(
-        getFilesToBuild(target), "/FileA.pb.h");
-
-    ObjcProvider provider = providerForTarget("//package:opl");
-    assertThat(provider.get(ObjcProvider.INCLUDE).toSet()).containsExactly(
-        // 2x parent directory because the package has one element ("package")
-        headerFile.getExecPath().getParentDirectory().getParentDirectory()
-    );
-  }
-
-  @Test
   public void testErrorForNoDepsAttribute() throws Exception {
     checkError(
         "x", "x", ProtoAttributes.NO_PROTOS_ERROR, "objc_proto_library(", "    name = 'x',", ")");
@@ -522,67 +362,6 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
         ")");
   }
 
-  // This is a test for deprecated functionality.
-  @Test
-  public void testErrorForDepWithFilegroupWithoutProtoFiles() throws Exception {
-    checkError(
-        "x",
-        "x",
-        ProtoAttributes.NO_PROTOS_ERROR,
-        "objc_proto_library(",
-        "    name = 'x',",
-        "    deps = [':fg'],",
-        ")",
-        "filegroup(",
-        "    name = 'fg',",
-        "    srcs = ['file.dat'],",
-        ")");
-  }
-
-  @Test
-  public void testWarningForProtoSourceDeps() throws Exception {
-    checkWarning(
-        "x",
-        "x",
-        ProtoAttributes.FILES_DEPRECATED_WARNING,
-        "objc_proto_library(",
-        "    name = 'x',",
-        "    deps = ['foo.proto'],",
-        ")");
-  }
-
-  @Test
-  public void testWarningForFilegroupDeps() throws Exception {
-    checkWarning(
-        "x",
-        "x",
-        ProtoAttributes.FILES_DEPRECATED_WARNING,
-        "filegroup(",
-        "    name = 'protos',",
-        "    srcs = ['foo.proto'],",
-        ")",
-        "objc_proto_library(",
-        "    name = 'x',",
-        "    deps = [':protos'],",
-        ")");
-  }
-
-  @Test
-  public void testObjcCopts() throws Exception {
-    useConfiguration("--objccopt=-foo");
-
-    List<String> args = compileAction("//package:opl", "FileA.pb.o").getArguments();
-    assertThat(args).contains("-foo");
-  }
-
-  @Test
-  public void testObjcCopts_argumentOrdering() throws Exception {
-    useConfiguration("--objccopt=-foo");
-
-    List<String> args = compileAction("//package:opl", "FileA.pb.o").getArguments();
-    assertThat(args).containsAllOf("-fno-objc-arc", "-foo").inOrder();
-  }
-
   @Test
   public void testErrorForPortableProtoFiltersEmpty() throws Exception {
     checkError(
@@ -601,85 +380,6 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
   }
 
   @Test
-  public void testErrorWhenDependingOnPB2FromProtobufTarget() throws Exception {
-    checkError(
-        "x",
-        "x",
-        ProtoAttributes.PROTOCOL_BUFFERS2_IN_PROTOBUF_DEPS_ERROR,
-        "objc_proto_library(",
-        "    name = 'x',",
-        "    portable_proto_filters = ['filter.pbascii'],",
-        "    deps = [':pb2', ':protos_b'],",
-        ")",
-        "objc_proto_library(",
-        "    name = 'pb2',",
-        "    deps = [':protos_a'],",
-        ")",
-        "proto_library(",
-        "    name = 'protos_a',",
-        "    srcs = ['a.proto'],",
-        ")",
-        "proto_library(",
-        "    name = 'protos_b',",
-        "    srcs = ['b.proto'],",
-        ")");
-  }
-
-  @Test
-  public void testErrorWhenDependingOnPB2FromPB2Target() throws Exception {
-    checkError(
-        "x",
-        "x",
-        ProtoAttributes.OBJC_PROTO_LIB_DEP_IN_PROTOCOL_BUFFERS2_DEPS_ERROR,
-        "objc_proto_library(",
-        "    name = 'x',",
-        "    deps = [':pb2', ':protos_b'],",
-        ")",
-        "objc_proto_library(",
-        "    name = 'pb2',",
-        "    deps = [':protos_a'],",
-        ")",
-        "proto_library(",
-        "    name = 'protos_a',",
-        "    srcs = ['a.proto'],",
-        ")",
-        "proto_library(",
-        "    name = 'protos_b',",
-        "    srcs = ['b.proto'],",
-        ")");
-  }
-
-  @Test
-  public void testErrorForPortableProtoFiltersWithUseObjcHeaderNames() throws Exception {
-    checkErrorForPortableProtoFilterWithPb2Option("use_objc_header_names = 1");
-  }
-
-  @Test
-  public void testErrorForPortableProtoFiltersWithPerProtoIncludes() throws Exception {
-    checkErrorForPortableProtoFilterWithPb2Option("per_proto_includes = 1");
-  }
-
-  @Test
-  public void testErrorForPortableProtoFiltersWithOptionsFile() throws Exception {
-    checkErrorForPortableProtoFilterWithPb2Option("options_file = 'options_file.txt'");
-  }
-
-  @Test
-  public void testErrorForUsesProtobufWithUseObjcHeaderNames() throws Exception {
-    checkErrorForUsesProtobufWithPb2Option("use_objc_header_names = 1");
-  }
-
-  @Test
-  public void testErrorForUsesProtobufWithPerProtoIncludes() throws Exception {
-    checkErrorForUsesProtobufWithPb2Option("per_proto_includes = 1");
-  }
-
-  @Test
-  public void testErrorForUsesProtobufWithOptionsFile() throws Exception {
-    checkErrorForUsesProtobufWithPb2Option("options_file = 'options_file.txt'");
-  }
-
-  @Test
   public void testModulemapCreatedForNonLinkingTargets() throws Exception {
     checkOnlyLibModuleMapsArePresentForTarget("//package:opl_protobuf");
   }
@@ -689,75 +389,6 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
     checkOnlyLibModuleMapsArePresentForTarget("//package:opl_binary");
   }
 
-  @Test
-  public void testErrorForPortableProtoFilterFilesInDeps() throws Exception {
-    checkError(
-        "x",
-        "x",
-        ProtoAttributes.FILES_NOT_ALLOWED_ERROR,
-        "objc_proto_library(",
-        "    name = 'x',",
-        "    portable_proto_filters = ['proto_filter.txt'],",
-        "    deps = [':protos'],",
-        ")",
-        "filegroup(",
-        "    name = 'protos',",
-        "    srcs = ['file.proto'],",
-        ")");
-  }
-
-  @Test
-  public void testErrorForUsesProtobufAsFalseWithFilters() throws Exception {
-    checkError(
-        "x",
-        "x",
-        ProtoAttributes.USES_PROTOBUF_CANT_BE_SPECIFIED_AS_FALSE,
-        "objc_proto_library(",
-        "    name = 'x',",
-        "    uses_protobuf = 0,",
-        "    portable_proto_filters = ['myfilter.pbascii'],",
-        "    deps = [':protos'],",
-        ")",
-        "proto_library(",
-        "    name = 'protos',",
-        "    srcs = ['file.proto'],",
-        ")");
-  }
-
-  private void checkErrorForPortableProtoFilterWithPb2Option(String pb2Option) throws Exception {
-    checkError(
-        "x",
-        "x",
-        ProtoAttributes.PROTOBUF_ATTRIBUTES_NOT_EXCLUSIVE_ERROR,
-        "objc_proto_library(",
-        "    name = 'x',",
-        "    portable_proto_filters = ['proto_filter.txt'],",
-        "    " + pb2Option + ",",
-        "    deps = [':protos'],",
-        ")",
-        "proto_library(",
-        "    name = 'protos',",
-        "    srcs = ['file.proto'],",
-        ")");
-  }
-
-  private void checkErrorForUsesProtobufWithPb2Option(String pb2Option) throws Exception {
-    checkError(
-        "x",
-        "x",
-        ProtoAttributes.PROTOBUF_ATTRIBUTES_NOT_EXCLUSIVE_ERROR,
-        "objc_proto_library(",
-        "    name = 'x',",
-        "    uses_protobuf = 1,",
-        "    " + pb2Option + ",",
-        "    deps = [':protos'],",
-        ")",
-        "proto_library(",
-        "    name = 'protos',",
-        "    srcs = ['file.proto'],",
-        ")");
-  }
-
   private static String sortedJoin(Iterable<String> elements) {
     return Joiner.on('\n').join(Ordering.natural().immutableSortedCopy(elements));
   }
@@ -780,30 +411,6 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
 
   @Test
   public void testObjcProvider() throws Exception {
-    ConfiguredTarget target = getConfiguredTarget("//package:opl");
-    Artifact headerFile =
-        ActionsTestUtil.getFirstArtifactEndingWith(getFilesToBuild(target), "/FileA.pb.h");
-    Artifact sourceFile =
-        ActionsTestUtil.getFirstArtifactEndingWith(getFilesToBuild(target), "/FileA.pb.m");
-
-    ObjcProvider provider = providerForTarget("//package:opl");
-    assertThat(provider.get(ObjcProvider.INCLUDE).toSet())
-        .contains(headerFile.getExecPath().getParentDirectory().getParentDirectory());
-
-    ConfiguredTarget libProtoBufTarget = getConfiguredTarget("//objcproto:ProtocolBuffers_lib");
-    assertThat(provider.get(ObjcProvider.LIBRARY).toSet())
-        .containsExactly(
-            getBinArtifact("libopl.a", target),
-            getBinArtifact("libProtocolBuffers_lib.a", libProtoBufTarget));
-
-    assertThat(provider.get(ObjcProvider.HEADER).toSet()).containsAllOf(headerFile, sourceFile);
-
-    assertThat(provider.get(ObjcProvider.INCLUDE).toSet())
-        .contains(headerFile.getExecPath().getParentDirectory().getParentDirectory());
-  }
-
-  @Test
-  public void testProtobufObjcProvider() throws Exception {
     ConfiguredTarget target = getConfiguredTarget("//package:opl_protobuf");
     Artifact headerFile =
         ActionsTestUtil.getFirstArtifactEndingWith(getFilesToBuild(target), "/FileA.pbobjc.h");
@@ -822,36 +429,18 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
   }
 
   @Test
-  public void testCompilationActionInCoverageMode() throws Exception {
-    useConfiguration("--collect_code_coverage");
-
-    ConfiguredTarget target = getConfiguredTarget("//package:opl");
-    CommandAction linkAction =
-        (CommandAction) getGeneratingAction(getBinArtifact("libopl.a", target));
-
-    CommandAction compileAction =
-        (CommandAction)
-            getGeneratingAction(
-                ActionsTestUtil.getFirstArtifactEndingWith(linkAction.getInputs(), "/FileA.pb.o"));
-
-    assertThat(Artifact.toRootRelativePaths(compileAction.getOutputs()))
-        .containsAllOf(
-            "package/_objs/opl/package/_generated_protos/opl/package/FileA.pb.o",
-            "package/_objs/opl/package/_generated_protos/opl/package/FileA.pb.gcno");
-  }
-
-  @Test
   public void testModuleMapActionFiltersHeaders() throws Exception {
-    ConfiguredTarget configuredTarget = getConfiguredTarget("//package:opl");
-    Artifact moduleMap = getGenfilesArtifact("opl.modulemaps/module.modulemap", configuredTarget);
+    ConfiguredTarget configuredTarget = getConfiguredTarget("//package:opl_protobuf");
+    Artifact moduleMap =
+        getGenfilesArtifact("opl_protobuf.modulemaps/module.modulemap", configuredTarget);
 
     CppModuleMapAction genMap = (CppModuleMapAction) getGeneratingAction(moduleMap);
     assertThat(Artifact.toRootRelativePaths(genMap.getPrivateHeaders())).isEmpty();
     assertThat(Artifact.toRootRelativePaths(genMap.getPublicHeaders()))
         .containsExactly(
-            "package/_generated_protos/opl/package/FileA.pb.h",
-            "package/_generated_protos/opl/package/dir/FileB.pb.h",
-            "package/_generated_protos/opl/dep/File.pb.h");
+            "package/_generated_protos/opl_protobuf/package/FileA.pbobjc.h",
+            "package/_generated_protos/opl_protobuf/package/dir/FileB.pbobjc.h",
+            "package/_generated_protos/opl_protobuf/dep/File.pbobjc.h");
   }
 
   @Test
@@ -859,25 +448,34 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
     useConfiguration("--cpu=ios_i386");
     ApplePlatform platform = ApplePlatform.IOS_SIMULATOR;
 
-    ConfiguredTarget target = getConfiguredTarget("//package:opl");
-    CommandAction linkAction =
-        (CommandAction) getGeneratingAction(getBinArtifact("libopl.a", target));
+    // Because protos are linked/compiled within the apple_binary context, we need to traverse the
+    // action graph to find the linked protos (.a) and compiled protos (.o).
+    ConfiguredTarget binaryTarget = getConfiguredTarget("//package:opl_binary");
+    SymlinkAction symlinkAction =
+        (SymlinkAction) getGeneratingAction(getBinArtifact("opl_binary_lipobin", binaryTarget));
 
-    CommandAction compileAction =
-        (CommandAction)
-            getGeneratingAction(
-                ActionsTestUtil.getFirstArtifactEndingWith(linkAction.getInputs(), "/FileA.pb.o"));
+    Artifact binaryInput = Iterables.getOnlyElement(symlinkAction.getInputs());
 
-    Artifact sourceFile =
+    CommandAction linkAction = (CommandAction) getGeneratingAction(binaryInput);
+
+    Artifact linkedProtos =
         ActionsTestUtil.getFirstArtifactEndingWith(
-            getFilesToBuild(getConfiguredTarget("//package:opl")), "/FileA.pb.m");
+            linkAction.getInputs(), "libopl_binary_BundledProtos_0.a");
+    CommandAction linkedProtosAction = (CommandAction) getGeneratingAction(linkedProtos);
 
     Artifact objectFile =
-        ActionsTestUtil.getFirstArtifactEndingWith(compileAction.getOutputs(), ".o");
+        ActionsTestUtil.getFirstArtifactEndingWith(
+            linkedProtosAction.getInputs(), "FileA.pbobjc.o");
+    CommandAction compiledProtoAction = (CommandAction) getGeneratingAction(objectFile);
+
+    Artifact sourceFile =
+        ActionsTestUtil.getFirstArtifactEndingWith(
+            compiledProtoAction.getInputs(), "/FileA.pbobjc.m");
     Artifact dotdFile =
-        ActionsTestUtil.getFirstArtifactEndingWith(compileAction.getOutputs(), ".d");
+        ActionsTestUtil.getFirstArtifactEndingWith(compiledProtoAction.getOutputs(), ".d");
+
     // We remove spaces since the crosstool rules do not use spaces in command line args.
-    String compileArgs = Joiner.on("").join(compileAction.getArguments()).replace(" ", "");
+    String compileArgs = Joiner.on("").join(compiledProtoAction.getArguments()).replace(" ", "");
 
     List<String> expectedArgs =
         new ImmutableList.Builder<String>()
@@ -895,7 +493,7 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
             .addAll(FASTBUILD_COPTS)
             .addAll(
                 ObjcLibraryTest.iquoteArgs(
-                    target.get(ObjcProvider.SKYLARK_CONSTRUCTOR), getTargetConfiguration()))
+                    binaryTarget.get(ObjcProvider.SKYLARK_CONSTRUCTOR), getTargetConfiguration()))
             .add("-I")
             .add(sourceFile.getExecPath().getParentDirectory().getParentDirectory().toString())
             .add("-fno-objc-arc")
@@ -911,34 +509,47 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
       assertThat(compileArgs).contains(expectedArg);
     }
 
-    assertRequiresDarwin(compileAction);
-    assertThat(Artifact.toRootRelativePaths(compileAction.getInputs()))
+    assertRequiresDarwin(compiledProtoAction);
+    assertThat(Artifact.toRootRelativePaths(compiledProtoAction.getInputs()))
         .containsAllOf(
-            "package/_generated_protos/opl/package/FileA.pb.m",
-            "package/_generated_protos/opl/package/FileA.pb.h",
-            "package/_generated_protos/opl/package/dir/FileB.pb.h",
-            "package/_generated_protos/opl/dep/File.pb.h");
+            "package/_generated_protos/opl_binary/package/FileA.pbobjc.m",
+            "package/_generated_protos/opl_binary/package/FileA.pbobjc.h",
+            "package/_generated_protos/opl_binary/package/dir/FileB.pbobjc.h",
+            "package/_generated_protos/opl_binary/dep/File.pbobjc.h");
   }
 
   @Test
   public void testLibraryLinkAction() throws Exception {
     useConfiguration("--cpu=ios_armv7");
-    Artifact libFile =
+
+    // Because protos are linked within the apple_binary context, we need to traverse the action
+    // graph to find the linked protos (.a).
+    ConfiguredTarget binaryTarget = getConfiguredTarget("//package:opl_binary");
+    SymlinkAction symlinkAction =
+        (SymlinkAction) getGeneratingAction(getBinArtifact("opl_binary_lipobin", binaryTarget));
+
+    Artifact binaryInput = Iterables.getOnlyElement(symlinkAction.getInputs());
+
+    CommandAction linkAction = (CommandAction) getGeneratingAction(binaryInput);
+
+    Artifact linkedProtos =
         ActionsTestUtil.getFirstArtifactEndingWith(
-            getFilesToBuild(getConfiguredTarget("//package:opl")), "/libopl.a");
-    CommandAction action = (CommandAction) getGeneratingAction(libFile);
-    assertThat(action.getArguments())
+            linkAction.getInputs(), "libopl_binary_BundledProtos_0.a");
+    CommandAction linkedProtosAction = (CommandAction) getGeneratingAction(linkedProtos);
+    Artifact objListFile =
+        ActionsTestUtil.getFirstArtifactEndingWith(linkedProtosAction.getInputs(), ".objlist");
+    assertThat(linkedProtosAction.getArguments())
         .containsAllIn(
             ImmutableList.of(
                 "-static",
                 "-filelist",
-                getBinArtifact("opl-archive.objlist", "//package:opl").getExecPathString(),
+                objListFile.getExecPathString(),
                 "-arch_only",
                 "armv7",
                 "-syslibroot",
                 AppleToolchain.sdkDir(),
                 "-o",
-                libFile.getExecPathString()));
-    assertRequiresDarwin(action);
+                linkedProtos.getExecPathString()));
+    assertRequiresDarwin(linkedProtosAction);
   }
 }