From b64fdac839fe75b0bd453752d235b10953db6e31 Mon Sep 17 00:00:00 2001 From: Ted Bauer Date: Tue, 25 Jun 2024 17:21:40 +0000 Subject: [PATCH] Switch to static_rlibs When a dependency takes multiple rust_ffi_static dependencies in its static_libs, their symbols collide. Switch to static_rlibs, which resolves the collisions. See b/349129702 for context. Bug: 349129702 Test: m Change-Id: I6cd2fe92629c7d44e22d113795b340e06175f008 --- tools/aconfig/aconfig_storage_read_api/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/aconfig/aconfig_storage_read_api/Android.bp b/tools/aconfig/aconfig_storage_read_api/Android.bp index 3b124b15c1..01eb398d63 100644 --- a/tools/aconfig/aconfig_storage_read_api/Android.bp +++ b/tools/aconfig/aconfig_storage_read_api/Android.bp @@ -85,7 +85,7 @@ cc_library { "libcxx_aconfig_storage_read_api_bridge_header", ], generated_sources: ["libcxx_aconfig_storage_read_api_bridge_code"], - whole_static_libs: ["libaconfig_storage_read_api_cxx_bridge"], + static_rlibs: ["libaconfig_storage_read_api_cxx_bridge"], export_include_dirs: ["include"], host_supported: true, vendor_available: true,