StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move prefer_rlib from binary to base compiler.

Browse Source 
Moves the prefer_rlib property out from being exclusively a binary
property to one thats part of the base compiler properties. This
provides a little more control over the libstd linkage in our libraries.
Specifically, this enables a usecase where rust_ffi_shared needs to link
against libstd statically rather than dynamically.

Bug: 175121262
Test: New Soong tests pass.
Change-Id: If68014c684a75ba70e9d7dacbb01c7d360dc25a1
This commit is contained in:
Ivan Lozano
2020-12-08 14:43:00 -05:00
parent 110d13bef3
commit ea08613dd3
4 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rust/binary.go
View File

@@ -24,11 +24,6 @@ func init() {
}
type BinaryCompilerProperties struct {
// Change the rustlibs linkage to select rlib linkage by default for device targets.
// Also link libstd as an rlib as well on device targets.
// Note: This is the default behavior for host targets.
Prefer_rlib *bool `android:"arch_variant"`
// Builds this binary as a static binary. Implies prefer_rlib true.
//
// Static executables currently only support for bionic targets. Non-bionic targets will not produce a fully static
@@ -115,7 +110,7 @@ func (binary *binaryDecorator) nativeCoverage() bool {
}
func (binary *binaryDecorator) preferRlib() bool {
return Bool(binary.Properties.Prefer_rlib) || Bool(binary.Properties.Static_executable)
return Bool(binary.baseCompiler.Properties.Prefer_rlib) || Bool(binary.Properties.Static_executable)
}
func (binary *binaryDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) android.Path {
@@ -156,8 +151,7 @@ func (binary *binaryDecorator) autoDep(ctx BaseModuleContext) autoDep {
// Binaries default to dylib dependencies for device, rlib for host.
if binary.preferRlib() {
return rlibAutoDep
}
if ctx.Device() {
} else if ctx.Device() {
return dylibAutoDep
} else {
return rlibAutoDep