Skip to content

internal change #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

internal change #473

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_aspect.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,21 +289,9 @@ def _rust_bindings_from_cc_aspect_impl(target, ctx):
if hasattr(ctx.rule.attr, "hdrs"):
public_hdrs = _collect_hdrs(ctx, features)

elif ctx.rule.kind == "cc_embed_data" or ctx.rule.kind == "upb_proto_library":
elif ctx.rule.kind in ("cc_embed_data", "upb_proto_library"):
public_hdrs = target[CcInfo].compilation_context.direct_public_headers

elif ctx.rule.kind == "cc_stubby_library":
public_hdrs = target[CcInfo].compilation_context.direct_public_headers
extra_rule_specific_deps = ctx.rule.attr.implicit_cc_deps

if not AdditionalRustSrcsProviderInfo in target:
fail("cc_stubby_library must provide AdditionalRustSrcsProviderInfo")

additional_provider = target[AdditionalRustSrcsProviderInfo]

extra_rs_srcs.extend(_get_additional_rust_srcs_from_provider(additional_provider))
extra_deps.extend(_get_additional_rust_deps_from_provider(additional_provider))

has_public_headers = len(public_hdrs) > 0
if not has_public_headers:
# This target doesn't have public headers, so there are no bindings to generate. However we
Expand Down Expand Up @@ -399,6 +387,7 @@ rust_bindings_from_cc_aspect = aspect(
"_cc_lib",
# for cc_stubby_library implicit deps
"implicit_cc_deps",
"_implicit_cc_deps",
],
requires = [rust_cc_proto_library_aspect],
required_aspect_providers = [CcInfo],
Expand Down