From 0a468a4f3b1c9dea9b31ca51cebd3db58d65e771 Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Mon, 13 May 2024 21:03:34 -0400 Subject: rust: made-to-order rust staticlibs Whenever any two Rust static libraries are included as static libraries anywhere in a CC dependency tree, we sometimes get duplicate symbol errors. To avoid this, we no longer directly link multiple rust static libs to CC modules. Instead, we build rust_ffi_rlib modules and produce the actual static library that gets linked against the CC module based on that CC module's full list of Rust rlib dependencies. This introduces a new static_rlibs property for cc modules to define the rust_ffi_rlib dependencies, which are then used to generate the module above. This CL is intended to deprecate rust_ffi_static. It leaves rust_ffi_static and rust_ffi static variants in place until the remaining rust_ffi_static declarations and uses can be removed. In the meantime, rust_ffi_static produces rust_ffi_rlib variants as well to make the transition easier. Bug: 254469782 Test: m # with no changes Test: m libapexsupport # with static_rlibs Test: m libunwindstack # with static_rlibs Test: m netsimd # with static_rlibs, no duplicate symbols Test: m blueprint_tests # New Soong tests Change-Id: I47e27ac967ef0cad46d398ebf59d8275929ae28a --- rust/testing.go | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) (limited to 'rust/testing.go') diff --git a/rust/testing.go b/rust/testing.go index 5837dccde..f31c59188 100644 --- a/rust/testing.go +++ b/rust/testing.go @@ -49,16 +49,28 @@ var PrepareForIntegrationTestWithRust = android.GroupFixturePreparers( func GatherRequiredDepsForTest() string { bp := ` rust_prebuilt_library { - name: "libstd", - crate_name: "std", - rlib: { - srcs: ["libstd.rlib"], - }, - dylib: { - srcs: ["libstd.so"], - }, - host_supported: true, - sysroot: true, + name: "libstd", + crate_name: "std", + rlib: { + srcs: ["libstd/libstd.rlib"], + }, + dylib: { + srcs: ["libstd/libstd.so"], + }, + host_supported: true, + sysroot: true, + } + rust_prebuilt_library { + name: "libcore.sysroot", + crate_name: "core", + rlib: { + srcs: ["libcore/libcore.rlib"], + }, + dylib: { + srcs: ["libcore/libcore.so"], + }, + host_supported: true, + sysroot: true, } ////////////////////////////// // Device module requirements @@ -176,10 +188,12 @@ func registerRequiredBuildComponentsForTest(ctx android.RegistrationContext) { ctx.RegisterModuleType("rust_fuzz_host", RustFuzzHostFactory) ctx.RegisterModuleType("rust_ffi", RustFFIFactory) ctx.RegisterModuleType("rust_ffi_shared", RustFFISharedFactory) - ctx.RegisterModuleType("rust_ffi_static", RustFFIStaticFactory) + ctx.RegisterModuleType("rust_ffi_rlib", RustFFIRlibFactory) + ctx.RegisterModuleType("rust_ffi_static", RustFFIStaticRlibFactory) ctx.RegisterModuleType("rust_ffi_host", RustFFIHostFactory) ctx.RegisterModuleType("rust_ffi_host_shared", RustFFISharedHostFactory) - ctx.RegisterModuleType("rust_ffi_host_static", RustFFIStaticHostFactory) + ctx.RegisterModuleType("rust_ffi_host_rlib", RustFFIRlibHostFactory) + ctx.RegisterModuleType("rust_ffi_host_static", RustFFIStaticRlibHostFactory) ctx.RegisterModuleType("rust_proc_macro", ProcMacroFactory) ctx.RegisterModuleType("rust_protobuf", RustProtobufFactory) ctx.RegisterModuleType("rust_protobuf_host", RustProtobufHostFactory) -- cgit v1.2.3-59-g8ed1b