Remove ProtoInfo from Bazel

PiperOrigin-RevId: 695726502
Change-Id: I7d708d891b4888d9adf9d16398201f37cdf29673

Author: comius

src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java

@@ -55,10 +55,7 @@
 import com.google.devtools.build.lib.rules.test.TestingSupportRules;
 import com.google.devtools.build.lib.starlarkbuildapi.android.AndroidBootstrap;
 import com.google.devtools.build.lib.starlarkbuildapi.core.ContextGuardedValue;
-import com.google.devtools.build.lib.starlarkbuildapi.proto.ProtoBootstrap;
 import com.google.devtools.build.lib.starlarkbuildapi.python.PyBootstrap;
-import com.google.devtools.build.lib.starlarkbuildapi.stubs.ProviderStub;
-import com.google.devtools.build.lib.starlarkbuildapi.stubs.StarlarkAspectStub;
 import com.google.devtools.build.lib.util.OS;
 import com.google.devtools.build.lib.util.ResourceFileLoader;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -250,11 +247,7 @@ public void init(ConfiguredRuleClassProvider.Builder builder) {
         @Override
         public void init(ConfiguredRuleClassProvider.Builder builder) {
           builder.addConfigurationFragment(ProtoConfiguration.class);
-
-          ProtoBootstrap bootstrap =
-              new ProtoBootstrap(
-                  BazelProtoCommon.INSTANCE, new StarlarkAspectStub(), new ProviderStub());
-          builder.addStarlarkBootstrap(bootstrap);
+          builder.addBzlToplevel("proto_common_do_not_use", BazelProtoCommon.INSTANCE);
         }
 
         @Override

src/main/starlark/builtins_bzl/bazel/exports.bzl

@@ -21,7 +21,7 @@ load(":common/java/java_toolchain.bzl", "java_toolchain")
 
 exported_toplevels = {
     "py_internal": py_internal,
-    "proto_common_do_not_use": struct(INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION = _builtins.toplevel.proto_common.incompatible_enable_proto_toolchain_resolution()),
+    "proto_common_do_not_use": struct(INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION = _builtins.toplevel.proto_common_do_not_use.incompatible_enable_proto_toolchain_resolution()),
 }
 exported_rules = {
     "java_package_configuration": java_package_configuration,

src/main/starlark/builtins_bzl/common/cc/cc_shared_library.bzl

@@ -22,7 +22,7 @@ load(":common/cc/semantics.bzl", "semantics")
 load(":common/paths.bzl", "paths")
 load(":common/proto/proto_info.bzl", _BuiltinProtoInfo = "ProtoInfo")
 
-_external_proto_infos = [[k] for k in _builtins.toplevel.proto_common.external_proto_infos()]
+_external_proto_infos = [[k] for k in _builtins.toplevel.proto_common_do_not_use.external_proto_infos()]
 
 # TODO(#5200): Add export_define to library_to_link and cc_library