commit b6eb98155a3b09dce037dcd3af453dcd7dac2233
author A Googler <no-reply@google.com> Tue Jul 18 22:37:36 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jul 18 22:38:14 2023 -0700
tree dbf92e0c42613765643ec27722e90015492ffe36
parent 27580fbcd7292e9774a0ccc175652b3ba3062720

Correctly handle transition de-deduplication in Starlark `android_binary`

PiperOrigin-RevId: 549207642
Change-Id: I7ea19cb0ef4bafa831ca46fcafc4ad3b906bd1e1

rules/native_deps.bzl

diff --git a/rules/native_deps.bzl b/rules/native_deps.bzl
index 24a2b0a..e5fe000 100644
--- a/rules/native_deps.bzl
+++ b/rules/native_deps.bzl
@@ -23,16 +23,38 @@
     doc = "Provides information about configuration for a split config dep",
     fields = dict(
         build_config = "The build configuration of the dep.",
+        android_config = "Select fields from the android configuration of the dep.",
+        target_platform = "The target platform label of the dep.",
     ),
 )
 
 def _split_config_aspect_impl(__, ctx):
-    return SplitConfigInfo(build_config = ctx.configuration)
+    android_cfg = ctx.fragments.android
+    return SplitConfigInfo(
+        build_config = ctx.configuration,
+        android_config = struct(
+            incompatible_use_toolchain_resolution = android_cfg.incompatible_use_toolchain_resolution,
+            android_cpu = android_cfg.android_cpu,
+            hwasan = android_cfg.hwasan,
+        ),
+        target_platform = ctx.fragments.platform.platform,
+    )
 
 split_config_aspect = aspect(
     implementation = _split_config_aspect_impl,
+    fragments = ["android"],
 )
 
+def _get_libs_dir_name(android_config, target_platform):
+    if android_config.incompatible_use_toolchain_resolution:
+        name = target_platform.name
+    else:
+        # Legacy builds use the CPU as the name.
+        name = android_config.android_cpu
+    if android_config.hwasan:
+        name = name + "-hwasan"
+    return name
+
 def process_java_infos(_ctx, deps):
     """Collects JavaInfos for process()
 
@@ -99,6 +121,10 @@
         cc_toolchain_dep = ctx.split_attr._cc_toolchain_split[key]
         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].android_config,
+            cc_toolchain_dep[SplitConfigInfo].target_platform,
+        )
         linker_input = cc_common.create_linker_input(
             owner = ctx.label,
             user_link_flags = ["-Wl,-soname=lib" + actual_target_name],
@@ -125,7 +151,7 @@
         libraries.extend(_filter_unique_shared_libs(native_deps_lib, cc_info))
 
         if libraries:
-            libs[key] = depset(libraries)
+            libs[libs_dir_name] = depset(libraries)
 
     if libs and native_libs_basename:
         libs_name = ctx.actions.declare_file("nativedeps_filename/" + actual_target_name + "/" + filename)