Skip to content

Commit fe35497

Browse files
A Googlercopybara-github
authored andcommitted
Switch C++ BuildInfo system to new API for android rules.
PiperOrigin-RevId: 581886436 Change-Id: If634d7a76c1c17ad0d0f731dbb294370940287ad
1 parent 6d49ecc commit fe35497

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

rules/native_deps.bzl

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,16 @@ def _is_shared_library(lib_artifact):
237237
return True
238238
return False
239239

240-
def _get_build_info(ctx):
241-
return cc_common.get_build_info(ctx)
240+
def _is_stamping_enabled(ctx):
241+
if ctx.configuration.is_tool_configuration():
242+
return 0
243+
return getattr(ctx.attr, "stamp", 0)
244+
245+
def _get_build_info(ctx, cc_toolchain):
246+
if _is_stamping_enabled(ctx):
247+
return cc_toolchain.build_info_files().non_redacted_build_info_files.to_list()
248+
else:
249+
return cc_toolchain.build_info_files().redacted_build_info_files.to_list()
242250

243251
def _get_shared_native_deps_path(
244252
linker_inputs,
@@ -306,7 +314,7 @@ def _link_native_deps_if_present(ctx, cc_info, cc_toolchain, build_config, actua
306314
linkstamps.extend(linker_input.linkstamps)
307315
linkstamps_dict = {linkstamp: None for linkstamp in linkstamps}
308316

309-
build_info_artifacts = _get_build_info(ctx) if linkstamps_dict else []
317+
build_info_artifacts = _get_build_info(ctx, cc_toolchain) if linkstamps_dict else []
310318
requested_features = ["static_linking_mode", "native_deps_link"]
311319
requested_features.extend(ctx.features)
312320
if not "legacy_whole_archive" in ctx.disabled_features:

0 commit comments

Comments
 (0)