Update cc_common.link API hack

Closes #589.

Author: aherrmann

BUILD.bazel

@@ -34,6 +34,7 @@ filegroup(
         ":BUILD.bazel",
         ":MODULE.bazel",
         ":WORKSPACE",
+        "//tools:all_files",
         "//zig:all_files",
     ],
     visibility = ["//visibility:public"],

MODULE.bazel

@@ -89,9 +89,3 @@ use_repo(
 # rules_bazel_integration_test/tools/update_deleted_packages.sh when invoked
 # through the rules_multirun target //util:update.
 bazel_dep(name = "cgrindel_bazel_starlib", version = "0.29.3", dev_dependency = True)
-
-# Hack to get around a cc_common.link(main_output) private API limitation.
-# See https://github.com/bazelbuild/bazel/pull/23838
-cc_common_link = use_repo_rule("//zig/private/bzlmod:cc_common_link.bzl", "cc_common_link")
-
-cc_common_link(name = "build_bazel_rules_android")

tools/BUILD.bazel

@@ -0,0 +1,9 @@
+# Execute `bazel run //util:update_filegroups` to update this target.
+filegroup(
+    name = "all_files",
+    srcs = [
+        ":BUILD.bazel",
+        "//tools/build_defs:all_files",
+    ],
+    visibility = ["//:__pkg__"],
+)

tools/build_defs/BUILD.bazel

@@ -0,0 +1,9 @@
+# Execute `bazel run //util:update_filegroups` to update this target.
+filegroup(
+    name = "all_files",
+    srcs = [
+        ":BUILD.bazel",
+        "//tools/build_defs/android:all_files",
+    ],
+    visibility = ["//tools:__pkg__"],
+)

tools/build_defs/android/BUILD.bazel

@@ -0,0 +1,18 @@
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
+bzl_library(
+    name = "cc_common_link",
+    srcs = ["cc_common_link.bzl"],
+    visibility = ["//zig:__subpackages__"],
+    deps = ["@bazel_skylib//lib:paths"],
+)
+
+# Execute `bazel run //util:update_filegroups` to update this target.
+filegroup(
+    name = "all_files",
+    srcs = [
+        ":BUILD.bazel",
+        ":cc_common_link.bzl",
+    ],
+    visibility = ["//tools/build_defs:__pkg__"],
+)

tools/build_defs/android/cc_common_link.bzl

@@ -0,0 +1,9 @@
+"""A module that exposes private APIs of cc_common.link.
+
+See https://github.com/bazelbuild/bazel/pull/23838#issuecomment-3756393397.
+"""
+
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+
+def cc_common_link(*args, **kwargs):
+    return cc_common.link(*args, **kwargs)

zig/BUILD.bazel

@@ -66,7 +66,6 @@ bzl_library(
     visibility = ["//visibility:public"],
     deps = [
         "//zig/private:platforms",
-        "//zig/private/bzlmod:cc_common_link",
         "//zig/private/bzlmod:zig",
         "//zig/private/common:semver",
         "//zig/private/repo:toolchains_repo",

zig/private/bzlmod/BUILD.bazel

@@ -11,18 +11,11 @@ bzl_library(
     ],
 )
 
-bzl_library(
-    name = "cc_common_link",
-    srcs = ["cc_common_link.bzl"],
-    visibility = ["//zig:__subpackages__"],
-)
-
 # Execute `bazel run //util:update_filegroups` to update this target.
 filegroup(
     name = "all_files",
     srcs = [
         ":BUILD.bazel",
-        ":cc_common_link.bzl",
         ":zig.bzl",
     ],
     visibility = ["//zig/private:__pkg__"],

zig/private/bzlmod/cc_common_link.bzl

@@ -33,11 +33,11 @@ bzl_library(
         ":zig_cache",
         ":zig_lib_dir",
         ":zig_target_triple",
+        "//tools/build_defs/android:cc_common_link",
         "//zig:bazel_tools",
         "//zig/private/providers:zig_module_info",
         "//zig/private/providers:zig_settings_info",
         "//zig/private/providers:zig_target_info",
-        "@build_bazel_rules_android//:cc_common_link.bzl",
         "@rules_cc//cc:find_cc_toolchain_bzl",
         "@rules_cc//cc/common",
     ],