Enable C++ symbols using compatiblity proxy

PiperOrigin-RevId: 823465606
Change-Id: I4f9654e6081d01a7a8c3bb4f2357de49d20a0ede

Author: comius

cc/BUILD

@@ -55,8 +55,7 @@ filegroup(
     srcs = glob([
         "**/*.bzl",
     ]) + [
-        "//cc/private/rules_impl:bzl_srcs",
-        "//cc/private/toolchain:bzl_srcs",
+        "//cc/private:bzl_srcs",
     ],
     visibility = ["//visibility:public"],
 )
@@ -67,8 +66,7 @@ filegroup(
         "**/*.bzl",
         "**/BUILD",
     ]) + [
-        "//cc/private/rules_impl:srcs",
-        "//cc/private/toolchain:srcs",
+        "//cc/private:srcs",
     ],
     visibility = ["//visibility:public"],
 )

cc/common/cc_common.bzl

@@ -11,9 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 """cc_common module"""
 
-load("//cc/private/rules_impl:native.bzl", "native_cc_common")
+load("@cc_compatibility_proxy//:symbols.bzl", _cc_common = "cc_common")
 
-cc_common = native_cc_common
+cc_common = _cc_common

cc/common/cc_info.bzl

@@ -11,9 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 """CcInfo"""
 
-load("//cc/private/rules_impl:native.bzl", "NativeCcInfo")
+load("@cc_compatibility_proxy//:symbols.bzl", _CcInfo = "CcInfo")
 
-CcInfo = NativeCcInfo
+CcInfo = _CcInfo

cc/common/debug_package_info.bzl

@@ -13,6 +13,6 @@
 # limitations under the License.
 """DebugPackageInfo"""
 
-load("//cc/private/rules_impl:native.bzl", "NativeDebugPackageInfo")
+load("@cc_compatibility_proxy//:symbols.bzl", _DebugPackageInfo = "DebugPackageInfo")
 
-DebugPackageInfo = NativeDebugPackageInfo
+DebugPackageInfo = _DebugPackageInfo

cc/extensions.bzl

@@ -35,10 +35,11 @@ def _compatibility_proxy_repo_impl(rctx):
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 bzl_library(
   name = "proxy_bzl",
-  srcs = ["proxy.bzl"],
+  srcs = ["proxy.bzl", "symbols.bzl"],
   deps = [
     "@rules_cc//cc/private/rules_impl:core_rules",
     "@rules_cc//cc/private/rules_impl:toolchain_rules",
+    "@rules_cc//cc/private:cc_common",
   ],
   visibility = ["@rules_cc//cc:__subpackages__"],
 )
@@ -80,14 +81,28 @@ cc_toolchain_alias = _cc_toolchain_alias
 CcSharedLibraryInfo = _CcSharedLibraryInfo
             """,
         )
+        rctx.file(
+            "symbols.bzl",
+            """
+load("@rules_cc//cc/private:cc_common.bzl", _cc_common = "cc_common")
+load("@rules_cc//cc/private:cc_info.bzl", _CcInfo = "CcInfo")
+load("@rules_cc//cc/private/toolchain_config:cc_toolchain_config_info.bzl", _CcToolchainConfigInfo = "CcToolchainConfigInfo")
+load("@rules_cc//cc/private:debug_package_info.bzl", _DebugPackageInfo = "DebugPackageInfo")
+
+cc_common = _cc_common
+CcInfo = _CcInfo
+DebugPackageInfo = _DebugPackageInfo
+CcToolchainConfigInfo = _CcToolchainConfigInfo
+            """,
+        )
     else:
         rctx.file(
             "BUILD",
             """
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 bzl_library(
   name = "proxy_bzl",
-  srcs = ["proxy.bzl"],
+  srcs = ["proxy.bzl", "symbols.bzl"],
   deps = ["@rules_cc//cc/private/rules_impl:native_bzl"],
   visibility = ["@rules_cc//cc:__subpackages__"],
 )
@@ -115,6 +130,21 @@ cc_toolchain_alias = native.cc_toolchain_alias
 CcSharedLibraryInfo = NativeCcSharedLibraryInfo
             """,
         )
+        rctx.file(
+            "symbols.bzl",
+            """
+load("@rules_cc//cc/private/rules_impl:native.bzl", "native_cc_common")
+load("@rules_cc//cc/private/rules_impl:native.bzl", "NativeCcInfo")
+load("@rules_cc//cc/private/rules_impl:native.bzl", "NativeDebugPackageInfo")
+load("@rules_cc//cc/private/rules_impl:native.bzl", "NativeCcToolchainConfigInfo")
+load("@rules_cc//cc/private/rules_impl:native.bzl", "NativeCcSharedLibraryInfo")
+
+cc_common = native_cc_common
+CcInfo = NativeCcInfo
+DebugPackageInfo = NativeDebugPackageInfo
+CcToolchainConfigInfo = NativeCcToolchainConfigInfo
+            """,
+        )
 
 _compatibility_proxy_repo_rule = repository_rule(
     _compatibility_proxy_repo_impl,

cc/find_cc_toolchain.bzl

@@ -63,7 +63,7 @@ CC_TOOLCHAIN_ATTRS = {
 
 def find_cc_toolchain(ctx, *, mandatory = True):
     """
-Returns the current `CcToolchainInfo`.
+    Returns the current `CcToolchainInfo`.
 
     Args:
       ctx: The rule context for which to find a toolchain.

cc/private/BUILD

@@ -14,6 +14,20 @@
 
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
+filegroup(
+    name = "bzl_srcs",
+    srcs = glob([
+        "**/*.bzl",
+    ]) + [
+        "//cc/private/compile:bzl_srcs",
+        "//cc/private/link:bzl_srcs",
+        "//cc/private/rules_impl:bzl_srcs",
+        "//cc/private/toolchain:bzl_srcs",
+        "//cc/private/toolchain_config:bzl_srcs",
+    ],
+    visibility = ["//visibility:public"],
+)
+
 filegroup(
     name = "srcs",
     srcs = glob([
@@ -35,6 +49,32 @@ bzl_library(
     visibility = ["//cc:__subpackages__"],
 )
 
+bzl_library(
+    name = "cc_common",
+    srcs = ["cc_common.bzl"],
+    visibility = [
+        "//cc:__subpackages__",
+        "@cc_compatibility_proxy//:__pkg__",
+    ],
+    deps = [
+        ":cc_info_bzl",
+        ":cc_internal_bzl",
+        ":cc_launcher_info_bzl",
+        ":cc_shared_library_hint_info_bzl",
+        ":debug_package_info_bzl",
+        "//cc/private/compile:compile_bzl",
+        "//cc/private/link:link_bzl",
+        "//cc/private/rules_impl:native_bzl",
+        "//cc/private/toolchain_config:toolchain_config_bzl",
+    ],
+)
+
+bzl_library(
+    name = "cc_info_bzl",
+    srcs = ["cc_info.bzl"],
+    visibility = ["//cc:__subpackages__"],
+)
+
 bzl_library(
     name = "debug_package_info_bzl",
     srcs = ["debug_package_info.bzl"],

cc/private/compile/BUILD

@@ -27,6 +27,14 @@ bzl_library(
     ],
 )
 
+filegroup(
+    name = "bzl_srcs",
+    srcs = glob([
+        "**/*.bzl",
+    ]),
+    visibility = ["//visibility:public"],
+)
+
 filegroup(
     name = "srcs",
     srcs = glob([

cc/private/link/BUILD

@@ -28,6 +28,14 @@ bzl_library(
     ],
 )
 
+filegroup(
+    name = "bzl_srcs",
+    srcs = glob([
+        "**/*.bzl",
+    ]),
+    visibility = ["//visibility:public"],
+)
+
 filegroup(
     name = "srcs",
     srcs = glob([

cc/private/rules_impl/cc_toolchain_info.bzl

@@ -15,7 +15,7 @@
 Definition of CcToolchainInfo provider.
 """
 
-visibility(["//third_party/bazel_rules/rules_cc/..."])
+visibility(["//cc/..."])
 
 def _needs_pic_for_dynamic_libraries(*, feature_configuration):
     return feature_configuration.is_enabled("supports_pic")