diff options
| author | 2024-05-13 21:03:34 -0400 | |
|---|---|---|
| committer | 2024-05-16 13:00:43 -0400 | |
| commit | 0a468a4f3b1c9dea9b31ca51cebd3db58d65e771 (patch) | |
| tree | 9ee8007e83b660eb7bb4affcbf6584ea3fdab82e /apex/apex.go | |
| parent | 28ed8f4f83551ca651dd3831eb5b0a23567f5fa6 (diff) | |
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
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go index ef57d7efc..0fc5a5ebb 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -702,7 +702,12 @@ var ( func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext, nativeModules ApexNativeDependencies, target android.Target, imageVariation string) { binVariations := target.Variations() libVariations := append(target.Variations(), blueprint.Variation{Mutator: "link", Variation: "shared"}) - rustLibVariations := append(target.Variations(), blueprint.Variation{Mutator: "rust_libraries", Variation: "dylib"}) + rustLibVariations := append( + target.Variations(), []blueprint.Variation{ + {Mutator: "rust_libraries", Variation: "dylib"}, + {Mutator: "link", Variation: ""}, + }..., + ) // Append "image" variation binVariations = append(binVariations, blueprint.Variation{Mutator: "image", Variation: imageVariation}) |