Add cc_support_deps on additional_rust_srcs_for_crubit_bindings.

PiperOrigin-RevId: 871940500

Author: Googler

rs_bindings_from_cc/bazel_support/additional_rust_srcs_for_crubit_bindings_aspect_hint.bzl

@@ -67,12 +67,16 @@ visibility([
     # <internal link> end
 ])
 
-def make_additional_rust_srcs_provider(srcs, namespace_path, deps, cc_deps):
+def make_additional_rust_srcs_provider(srcs, namespace_path, deps, cc_deps, cc_support_deps = []):
     return AdditionalRustSrcsProviderInfo(
         srcs = srcs,
         namespace_path = namespace_path,
         deps = _get_additional_rust_deps_variant_info(deps),
         cc_deps = _get_additional_cc_deps_variant_info(cc_deps),
+        cc_support_deps = [
+            dep[CcInfo]
+            for dep in cc_support_deps
+        ],
     )
 
 def _additional_rust_srcs_for_crubit_bindings_impl(ctx):
@@ -81,6 +85,7 @@ def _additional_rust_srcs_for_crubit_bindings_impl(ctx):
         ctx.attr.namespace_path,
         ctx.attr.deps,
         ctx.attr.cc_deps,
+        ctx.attr.cc_support_deps,
     )]
 
 _additional_rust_srcs_for_crubit_bindings_rule = rule(
@@ -102,6 +107,10 @@ _additional_rust_srcs_for_crubit_bindings_rule = rule(
             default = [],
             aspects = [rust_bindings_from_cc_aspect],
         ),
+        "cc_support_deps": attr.label_list(
+            mandatory = False,
+            default = [],
+        ),
     },
     implementation = _additional_rust_srcs_for_crubit_bindings_impl,
 )
@@ -112,6 +121,7 @@ def additional_rust_srcs_for_crubit_bindings(
         namespace_path = "",
         deps = [],
         cc_deps = [],
+        cc_support_deps = [],
         **kwargs):
     """
     Defines an aspect hint that is used to pass extra Rust source files to `rs_bindings_from_cc` tool's `extra_rs_srcs` CLI argument.
@@ -131,6 +141,10 @@ def additional_rust_srcs_for_crubit_bindings(
             deps as rust_library.
         cc_deps: List of cc_library targets whose crubit-generated bindings will be made available
             to this library target.
+        cc_support_deps: List of cc_library targets of support libraries for generated C++ code.
+            For example, C++ types that have composable bridging should define their supporting
+            Crubit ABI types here so they're available to generated code without being exposed to
+            Crubit.
         **kwargs: Args passed through to the underlying rule (visibility, etc.).
     """
 
@@ -140,6 +154,7 @@ def additional_rust_srcs_for_crubit_bindings(
         namespace_path = namespace_path,
         deps = deps,
         cc_deps = cc_deps,
+        cc_support_deps = cc_support_deps,
         **kwargs
     )
 

rs_bindings_from_cc/bazel_support/providers.bzl

@@ -17,6 +17,7 @@ generated Rust bindings of this C++ target.
                 "linking a native library.",
         "cc_deps": "List of DepVariantInfo of cc_library targets whose crubit-generated bindings " +
                    "will be linked to this library target.",
+        "cc_support_deps": "List of CcInfo of support libraries for generated C++ code.",
     },
 )
 

rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_aspect.bzl

@@ -117,6 +117,15 @@ def _get_additional_rust_deps(aspect_ctx):
             )
     return collections.uniq(additional_rust_deps)
 
+def _get_cc_support_deps(aspect_ctx):
+    cc_support_deps = []
+    for hint in aspect_ctx.rule.attr.aspect_hints:
+        if AdditionalRustSrcsProviderInfo in hint:
+            cc_support_deps.extend(
+                hint[AdditionalRustSrcsProviderInfo].cc_support_deps,
+            )
+    return collections.uniq(cc_support_deps)
+
 def _collect_hdrs(ctx, crubit_features):
     public_hdrs = _filter_hdrs(ctx.rule.files.hdrs)
     label = str(ctx.label)
@@ -282,6 +291,8 @@ def _rust_bindings_from_cc_aspect_impl(target, ctx):
     extra_rs_srcs = []
     extra_deps = []
 
+    cc_support_deps = _get_cc_support_deps(ctx)
+
     # Headers for which we will produce bindings.
     public_hdrs = []
 
@@ -371,7 +382,7 @@ def _rust_bindings_from_cc_aspect_impl(target, ctx):
             d.cc_info
             for d in binding_infos
             if d.cc_info
-        ] + ctx.attr._deps_for_bindings[DepsForBindingsInfo].deps_for_cc_file,
+        ] + ctx.attr._deps_for_bindings[DepsForBindingsInfo].deps_for_cc_file + cc_support_deps,
         deps_for_rs_file = depset(
             direct = [
                 d.dep_variant_info