Post-Bazel 7 cleanups.

PiperOrigin-RevId: 891019618

Author: haberman

bazel/common/BUILD

@@ -10,7 +10,6 @@ bzl_library(
     visibility = ["//visibility:public"],
     deps = [
         ":proto_lang_toolchain_info_bzl",
-        "//bazel/private:native_bzl",
         "//bazel/private:toolchain_helpers_bzl",
         "@proto_bazel_features//:features",
     ],
@@ -24,7 +23,6 @@ bzl_library(
     visibility = ["//visibility:public"],
     deps = [
         "//bazel/private:proto_info_bzl",
-        "@proto_bazel_features//:features",
     ],
 )
 
@@ -34,9 +32,6 @@ bzl_library(
         "proto_lang_toolchain_info.bzl",
     ],
     visibility = ["//visibility:public"],
-    deps = [
-        "//bazel/private:native_bzl",
-    ],
 )
 
 filegroup(

bazel/common/proto_common.bzl

@@ -9,7 +9,6 @@
 
 load("@proto_bazel_features//:features.bzl", "bazel_features")
 load("//bazel/common:proto_lang_toolchain_info.bzl", "ProtoLangToolchainInfo")
-load("//bazel/private:native.bzl", "native_proto_common")
 load("//bazel/private:toolchain_helpers.bzl", "toolchains")
 
 def _import_virtual_proto_path(path):
@@ -100,10 +99,6 @@ def _check_collocated(label, proto_info, proto_lang_toolchain_info):
         Obtained from a `proto_lang_toolchain` target.
     """
     _PackageSpecificationInfo = bazel_features.globals.PackageSpecificationInfo
-    if not _PackageSpecificationInfo:
-        if proto_lang_toolchain_info.allowlist_different_package or getattr(proto_info, "allow_exports", None):
-            fail("Allowlist checks not supported before Bazel 6.4.0")
-        return
 
     if (proto_info.direct_descriptor_set.owner.package != label.package and
         proto_lang_toolchain_info.allowlist_different_package):
@@ -351,8 +346,5 @@ proto_common = struct(
     get_import_path = _get_import_path,
     ProtoLangToolchainInfo = ProtoLangToolchainInfo,
     INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION = toolchains.INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION,
-    INCOMPATIBLE_PASS_TOOLCHAIN_TYPE = (
-        getattr(native_proto_common, "INCOMPATIBLE_PASS_TOOLCHAIN_TYPE", False) or
-        not hasattr(native_proto_common, "ProtoLangToolchainInfo")
-    ),
+    INCOMPATIBLE_PASS_TOOLCHAIN_TYPE = True,
 )

bazel/common/proto_info.bzl

@@ -1,7 +1,5 @@
 """ProtoInfo"""
 
-load("@proto_bazel_features//:features.bzl", "bazel_features")
 load("//bazel/private:proto_info.bzl", _ProtoInfo = "ProtoInfo")
 
-# This resolves to Starlark ProtoInfo in Bazel 8 or with --incompatible_enable_autoload flag
-ProtoInfo = getattr(bazel_features.globals, "ProtoInfo", None) or _ProtoInfo
+ProtoInfo = _ProtoInfo

bazel/common/proto_lang_toolchain_info.bzl

@@ -1,9 +1,6 @@
 """ProtoLangToolchainInfo"""
 
-load("//bazel/private:native.bzl", "native_proto_common")
-
-# Use Starlark implementation only if native_proto_common.ProtoLangToolchainInfo doesn't exist
-ProtoLangToolchainInfo = getattr(native_proto_common, "ProtoLangToolchainInfo", provider(
+ProtoLangToolchainInfo = provider(
     doc = """Specifies how to generate language-specific code from .proto files.
             Used by LANG_proto_library rules.""",
     fields = dict(
@@ -23,4 +20,4 @@ ProtoLangToolchainInfo = getattr(native_proto_common, "ProtoLangToolchainInfo",
           different package than proto_library""",
         toolchain_type = """(Label) Toolchain type that was used to obtain this info""",
     ),
-))
+)