Refactored and rearranged Bazel rules

- OSS-specific code now lives in `bazel/private/oss`.
- UPB rules (which are not truly public, as UPB is meant to be a backend to other impls) are moved from `bazel/` -> `upb/bazel/`

PiperOrigin-RevId: 843750379

Author: haberman

MODULE.bazel

@@ -132,11 +132,11 @@ use_repo(
 
 # However this registration only matters if the config_setting for prefer_prebuilt_protoc is true,
 # using --@protobuf//bazel/toolchains:prefer_prebuilt_protoc
-register_toolchains("//bazel/private/toolchains/prebuilt:all")
+register_toolchains("//bazel/private/oss/toolchains/prebuilt:all")
 
 # From-source protobuf toolchains
 # Fallback if nothing is already registered
-register_toolchains("//bazel/private/toolchains:all")
+register_toolchains("//bazel/private/oss/toolchains:all")
 
 SUPPORTED_PYTHON_VERSIONS = [
     "3.10",

bazel/BUILD.bazel bazel/BUILDbazel/BUILD.bazel renamed to bazel/BUILD

@@ -1,36 +1,32 @@
-# Copyright (c) 2009-2021, Google LLC
-# All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
-
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
-licenses(["notice"])
+package(default_applicable_licenses = ["//:license"])
 
 bzl_library(
     name = "proto_library_bzl",
     srcs = ["proto_library.bzl"],
     visibility = ["//visibility:public"],
     deps = [
         "//bazel/private:proto_library_rule_bzl",
-        "@proto_bazel_features//:features",
     ],
 )
 
 bzl_library(
     name = "cc_proto_library_bzl",
     srcs = ["cc_proto_library.bzl"],
     visibility = ["//visibility:public"],
-    deps = ["//bazel/private:bazel_cc_proto_library_bzl"],
+    deps = [
+        "//bazel/private/oss:cc_proto_library_bzl",
+    ],
 )
 
 bzl_library(
     name = "java_proto_library_bzl",
     srcs = ["java_proto_library.bzl"],
     visibility = ["//visibility:public"],
-    deps = ["//bazel/private:bazel_java_proto_library_rule_bzl"],
+    deps = [
+        "//bazel/private:java_proto_library_bzl",
+    ],
 )
 
 bzl_library(
@@ -45,23 +41,8 @@ bzl_library(
     srcs = ["py_proto_library.bzl"],
     visibility = ["//visibility:public"],
     deps = [
-        "//bazel/common:proto_common_bzl",
-        "//bazel/common:proto_info_bzl",
-        "//bazel/private:toolchain_helpers_bzl",
-        "@rules_python//python:py_info_bzl",
-    ],
-)
-
-bzl_library(
-    name = "upb_proto_library_bzl",
-    srcs = [
-        "upb_c_proto_library.bzl",
-        "upb_minitable_proto_library.bzl",
-        "upb_proto_library.bzl",
-        "upb_proto_reflection_library.bzl",
+        "//bazel/private/oss:py_proto_library_bzl",
     ],
-    visibility = ["//visibility:public"],
-    deps = ["//bazel/private:upb_proto_library_internal_bzl"],
 )
 
 bzl_library(
@@ -75,13 +56,15 @@ filegroup(
     name = "for_bazel_tests",
     testonly = True,
     srcs = [
-        "BUILD.bazel",
+        "BUILD",
         ":cc_proto_library_bzl",
         ":java_lite_proto_library_bzl",
         ":proto_library_bzl",
         ":py_proto_library_bzl",
         "//bazel/common:for_bazel_tests",
         "//bazel/toolchains:for_bazel_tests",
     ],
-    visibility = ["//bazel/private:__pkg__"],
+    visibility = [
+        "//bazel/private:__pkg__",
+    ],
 )

bazel/cc_proto_library.bzl

@@ -1,6 +1,13 @@
+# Copyright (c) 2009-2024, Google LLC
+# All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
 """cc_proto_library rule"""
 
-load("//bazel/private:bazel_cc_proto_library.bzl", _cc_proto_library = "cc_proto_library")  # buildifier: disable=bzl-visibility
+load("//bazel/private/oss:cc_proto_library.bzl", _cc_proto_library = "cc_proto_library")
 
 def cc_proto_library(**kwattrs):
     # Only use Starlark rules when they are removed from Bazel

…3/third_party/protobuf/bazel/flags/BUILD bazel/flags/BUILDgoogle3/third_party/protobuf/bazel/flags/BUILD renamed to bazel/flags/BUILD google3/third_party/protobuf/bazel/flags/BUILD renamed to bazel/flags/BUILD

@@ -4,9 +4,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file or at
 # https://developers.google.com/open-source/licenses/bsd
+
 """java_lite_proto_library rule"""
 
-load("//bazel/private:java_lite_proto_library.bzl", _java_lite_proto_library = "java_lite_proto_library")  # buildifier: disable=bzl-visibility
+load("//bazel/private:java_lite_proto_library.bzl", _java_lite_proto_library = "java_lite_proto_library")
 
 def java_lite_proto_library(**kwattrs):
     # Only use Starlark rules when they are removed from Bazel

…hird_party/protobuf/bazel/flags/cc/BUILD bazel/flags/cc/BUILDgoogle3/third_party/protobuf/bazel/flags/cc/BUILD renamed to bazel/flags/cc/BUILD google3/third_party/protobuf/bazel/flags/cc/BUILD renamed to bazel/flags/cc/BUILD

@@ -4,9 +4,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file or at
 # https://developers.google.com/open-source/licenses/bsd
-"""java_proto_library rule"""
 
-load("//bazel/private:bazel_java_proto_library_rule.bzl", _java_proto_library = "java_proto_library")  # buildifier: disable=bzl-visibility
+"""java_proto_library rule."""
+
+load("//bazel/private:java_proto_library.bzl", _java_proto_library = "java_proto_library")
 
 def java_proto_library(**kwattrs):
     # Only use Starlark rules when they are removed from Bazel

…d_party/protobuf/bazel/flags/cc/empty.sh bazel/flags/cc/empty.shgoogle3/third_party/protobuf/bazel/flags/cc/empty.sh renamed to bazel/flags/cc/empty.sh google3/third_party/protobuf/bazel/flags/cc/empty.sh renamed to bazel/flags/cc/empty.sh

@@ -28,22 +28,6 @@ toolchain_type(
     visibility = ["//visibility:public"],
 )
 
-bzl_library(
-    name = "upb_proto_library_internal_bzl",
-    srcs = [
-        "upb_proto_library_internal/aspect.bzl",
-        "upb_proto_library_internal/cc_library_func.bzl",
-        "upb_proto_library_internal/copts.bzl",
-        "upb_proto_library_internal/rule.bzl",
-    ],
-    visibility = ["//bazel:__pkg__"],
-    deps = [
-        "//bazel/common:proto_common_bzl",
-        "@bazel_skylib//lib:paths",
-        "@bazel_tools//tools/cpp:toolchain_utils.bzl",
-    ],
-)
-
 bzl_library(
     name = "native_bzl",
     srcs = [
@@ -75,9 +59,9 @@ bzl_library(
 )
 
 bzl_library(
-    name = "bazel_java_proto_library_rule_bzl",
+    name = "java_proto_library_bzl",
     srcs = [
-        "bazel_java_proto_library_rule.bzl",
+        "java_proto_library.bzl",
         "java_proto_support.bzl",
     ],
     visibility = [
@@ -109,18 +93,13 @@ bzl_library(
 )
 
 bzl_library(
-    name = "bazel_cc_proto_library_bzl",
-    srcs = [
-        "bazel_cc_proto_library.bzl",
-        "cc_proto_support.bzl",
-    ],
-    visibility = ["//bazel:__subpackages__"],
+    name = "cc_proto_support_bzl",
+    srcs = ["cc_proto_support.bzl"],
+    visibility = ["//bazel/private:__subpackages__"],
     deps = [
-        ":toolchain_helpers_bzl",
-        "//bazel/common:proto_common_bzl",
-        "//bazel/common:proto_info_bzl",
         "@proto_bazel_features//:features",
         "@rules_cc//cc:find_cc_toolchain_bzl",
+        "@rules_cc//cc/common",
     ],
 )
 
@@ -152,11 +131,27 @@ bzl_library(
     ],
 )
 
+bzl_library(
+    name = "java_proto_aspect_names_bzl",
+    srcs = ["java_proto_aspect_names.bzl"],
+    visibility = ["@rules_java//java/google/rules:__pkg__"],
+)
+
 bzl_library(
     name = "cc_proto_aspect_bzl",
     srcs = ["cc_proto_aspect.bzl"],
+    visibility = [
+        "//rust/bazel:__pkg__",
+    ],
     deps = [
-        ":bazel_cc_proto_library_bzl",
+        "//bazel/private/oss:cc_proto_library_bzl",
+    ],
+)
+
+bzl_library(
+    name = "cc_proto_aspect_name_bzl",
+    srcs = ["cc_proto_aspect_name.bzl"],
+    visibility = [
     ],
 )
 
@@ -207,9 +202,12 @@ filegroup(
     testonly = True,
     srcs = [
         "BUILD",
+        ":java_proto_library_bzl",
         ":native_bool_flag_bzl",
+        ":toolchain_helpers_bzl",
         "//bazel:for_bazel_tests",
-        "//bazel/private/toolchains:for_bazel_tests",
+        "//bazel/private/google:for_bazel_tests",
+        "//bazel/private/oss/toolchains:for_bazel_tests",
     ],
     visibility = ["//visibility:public"],
 )