Skip to content

Defer cc_toolchain requirement as long as possible #557

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
keith wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −3
Open

Defer cc_toolchain requirement as long as possible #557

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion rules/android_binary/attrs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ ATTRS = _attrs.replace(
_enable_manifest_merging = attr.bool(default = True),
_cc_toolchain_split = attr.label(
cfg = android_split_transition,
default = "@rules_cc//cc:current_cc_toolchain",
default = "@rules_cc//cc:optional_current_cc_toolchain",
aspects = [split_config_aspect],
),
_desugared_lib_config = attr.label(
Expand Down
15 changes: 13 additions & 2 deletions rules/native_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ def process(ctx, filename, merged_libraries_map = {}):
libs = dict()
for key, deps in ctx.split_attr.deps.items():
cc_toolchain_dep = ctx.split_attr._cc_toolchain_split[key]
cc_toolchain = cc_toolchain_dep[cc_common.CcToolchainInfo]
cc_toolchain = None
if cc_common.CcToolchainInfo in cc_toolchain_dep:
cc_toolchain = cc_toolchain_dep[cc_common.CcToolchainInfo]
build_config = cc_toolchain_dep[SplitConfigInfo].build_config
libs_dir_name = _get_libs_dir_name(
cc_toolchain_dep[SplitConfigInfo].target_platform,
Expand Down Expand Up @@ -382,6 +384,15 @@ def _link_native_deps_if_present(ctx, cc_info, cc_toolchain, build_config, targe
for input in all_inputs:
needs_linking = needs_linking or _contains_code_to_link(input)

if not needs_linking:
return None

if not cc_toolchain:
fail(
"An Android C++ toolchain is required to link the native dependencies of %s. " % ctx.label +
"Register an Android NDK toolchain for the requested Android platform.",
)

configured_features = cc_common.configure_features(
ctx = ctx,
cc_toolchain = cc_toolchain,
Expand All @@ -390,7 +401,7 @@ def _link_native_deps_if_present(ctx, cc_info, cc_toolchain, build_config, targe
)

# Note: the hasattr() call here is necessary for Bazel 7 compatibility.
if not needs_linking or (hasattr(configured_features, "is_requested") and configured_features.is_requested("disable_fallback_native_deps_linking")):
if hasattr(configured_features, "is_requested") and configured_features.is_requested("disable_fallback_native_deps_linking"):
return None

# This does not need to be shareable, but we use this API to specify the
Expand Down