Overhaul @rules_java bzl_library dep graph

 - Construct an accurate `bzl_library` target for the compatibility proxy
 - Updates `proto_support.bzl` to use the right `java_common`
 - Work towards fixing bazelbuild/bazel#24455

PiperOrigin-RevId: 699129931
Change-Id: I55f6e744602e3760f69bc197a8f107fd119feee0

Author: hvadehra

.bazelci/presubmit.yml

@@ -4,7 +4,6 @@ build_targets: &build_targets
   - "@remote_java_tools//java_tools/..."
   # TODO: Look into broken targets in //toolchains
   - "-//toolchains/..."
-  - "-//test/repo/..."
   # TODO: re-enable docs after protobuf is fixed
   - "-//java/docs/..."
   - "-//test:docs_up_to_date_test"

java/BUILD

@@ -65,6 +65,13 @@ bzl_library(
     deps = ["//java/common"],
 )
 
+bzl_library(
+    name = "http_jar_bzl",
+    srcs = ["http_jar.bzl"],
+    visibility = ["//visibility:public"],
+    deps = ["@bazel_tools//tools:bzl_srcs"],
+)
+
 filegroup(
     name = "for_bazel_tests",
     testonly = 1,

java/bazel/rules/BUILD.bazel

@@ -24,9 +24,10 @@ bzl_library(
     srcs = glob(["*.bzl"]),
     visibility = ["//visibility:public"],  # for Bazel docgen
     deps = [
-        "//java/common",
+        "//java/common:semantics_bzl",
         "//java/common/rules:core_rules",
         "//java/common/rules/impl",
+        "//java/private:internals",
         "@bazel_skylib//lib:paths",
         "@rules_cc//cc:find_cc_toolchain_bzl",
         "@rules_cc//cc/common",

java/common/BUILD

@@ -14,14 +14,32 @@ filegroup(
 
 bzl_library(
     name = "common",
-    srcs = glob(["*.bzl"]),
+    srcs = glob(
+        ["*.bzl"],
+        exclude = [
+            "java_semantics.bzl",
+            "proguard_spec_info.bzl",
+        ],
+    ),
+    visibility = ["//visibility:public"],
+    deps = ["@compatibility_proxy//:proxy_bzl"],
+)
+
+bzl_library(
+    name = "semantics_bzl",
+    srcs = ["java_semantics.bzl"],
     visibility = ["//visibility:public"],
     deps = [
-        "//java/private:internals",
-        "@compatibility_proxy//:proxy_bzl",
+        "@rules_cc//cc/common",
     ],
 )
 
+bzl_library(
+    name = "proguard_spec_info_bzl",
+    srcs = ["proguard_spec_info.bzl"],
+    visibility = ["//visibility:public"],
+)
+
 filegroup(
     name = "for_bazel_tests",
     testonly = 1,

java/common/rules/BUILD

@@ -38,7 +38,7 @@ bzl_library(
     deps = [
         ":android_lint_bzl",
         ":rule_util_bzl",
-        "//java/common",
+        "//java/private:internals",
         "@bazel_skylib//lib:paths",
         "@rules_cc//cc/common",
     ],
@@ -53,6 +53,7 @@ bzl_library(
     ],
     visibility = [
         "//java:__subpackages__",
+        "@compatibility_proxy//:__pkg__",
     ],
 )
 

java/common/rules/impl/BUILD

@@ -17,6 +17,7 @@ bzl_library(
     visibility = ["//java:__subpackages__"],
     deps = [
         ":java_helper_bzl",
+        "//java/common:proguard_spec_info_bzl",
         "@com_google_protobuf//bazel/common:proto_info_bzl",
     ],
 )

java/private/BUILD

@@ -7,7 +7,10 @@ bzl_library(
     srcs = [
         "native.bzl",
     ],
-    visibility = ["//java:__subpackages__"],
+    visibility = [
+        "//java:__subpackages__",
+        "@compatibility_proxy//:__pkg__",
+    ],
 )
 
 bzl_library(
@@ -19,7 +22,10 @@ bzl_library(
         "java_info.bzl",
         "message_bundle_info.bzl",
     ],
-    visibility = ["//java:__subpackages__"],
+    visibility = [
+        "//java:__subpackages__",
+        "@compatibility_proxy//:__pkg__",
+    ],
     deps = [
         ":native_bzl",
         "//java/common/rules:toolchain_rules",
@@ -35,7 +41,7 @@ bzl_library(
     name = "proto_support",
     srcs = ["proto_support.bzl"],
     visibility = ["//visibility:public"],
-    deps = [":native_bzl"],
+    deps = ["@compatibility_proxy//:proxy_bzl"],
 )
 
 filegroup(

java/private/proto_support.bzl

@@ -13,7 +13,7 @@
 # limitations under the License.
 """Support for Java compilation of protocol buffer generated code."""
 
-load("//java/common:java_common.bzl", "java_common")
+load("@compatibility_proxy//:proxy.bzl", "java_common")
 
 # Partial support, because internal symbols are not available in older Bazel version
 # TODO: Once Java rules are moved into the rules_java, this should become a full support.

java/rules_java_deps.bzl

@@ -6,14 +6,25 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 def _compatibility_proxy_repo_impl(rctx):
     # TODO: use @bazel_features
     bazel = native.bazel_version
-    rctx.file(
-        "BUILD.bazel",
-        """
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-bzl_library(name = "proxy_bzl", srcs = ["proxy.bzl"], visibility = ["//visibility:public"])
-        """,
-    )
     if not bazel or bazel >= "8":
+        rctx.file(
+            "BUILD.bazel",
+            """
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+exports_files(['proxy.bzl'], visibility = ["@rules_java//test:__pkg__"])
+bzl_library(
+    name = "proxy_bzl",
+    srcs = ["proxy.bzl"],
+    deps = [
+        "@rules_java//java/bazel/rules",
+        "@rules_java//java/common/rules:toolchain_rules",
+        "@rules_java//java/private:internals",
+        "@rules_java//java:http_jar_bzl",
+    ],
+    visibility = ["//visibility:public"]
+)
+            """,
+        )
         rctx.file(
             "proxy.bzl",
             """
@@ -45,6 +56,22 @@ http_jar = _http_jar
             """,
         )
     else:
+        rctx.file(
+            "BUILD.bazel",
+            """
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+exports_files(['proxy.bzl'], visibility = ["@rules_java//test:__pkg__"])
+bzl_library(
+    name = "proxy_bzl",
+    srcs = ["proxy.bzl"],
+    deps = [
+        "@rules_java//java/private:native_bzl",
+        "@bazel_tools//tools:bzl_srcs",
+    ],
+    visibility = ["//visibility:public"]
+)
+            """,
+        )
         rctx.file(
             "proxy.bzl",
             """

java/toolchains/BUILD

@@ -14,10 +14,7 @@ bzl_library(
     name = "toolchain_rules",
     srcs = glob(["*.bzl"]),
     visibility = ["//visibility:public"],
-    deps = [
-        "//java/private:native_bzl",
-        "@compatibility_proxy//:proxy_bzl",
-    ],
+    deps = ["@compatibility_proxy//:proxy_bzl"],
 )
 
 filegroup(