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

Merge "Rust library linking fixes" into main

Browse Source
This commit is contained in:
Cody Schuffelen
2023-08-16 19:51:02 +00:00
committed by Gerrit Code Review
parent b0e1035417 c183e3a473
commit d89ee08bbf
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rust/library.go
View File

@@ -466,7 +466,15 @@ func (library *libraryDecorator) compilerFlags(ctx ModuleContext, flags Flags) F
library.includeDirs = append(library.includeDirs, android.PathsForModuleSrc(ctx, library.Properties.Include_dirs)...) library.includeDirs = append(library.includeDirs, android.PathsForModuleSrc(ctx, library.Properties.Include_dirs)...)
} }
if library.shared() { if library.shared() {
flags.LinkFlags = append(flags.LinkFlags, "-Wl,-soname="+library.sharedLibFilename(ctx)) if ctx.Darwin() {
flags.LinkFlags = append(
flags.LinkFlags,
"-dynamic_lib",
"-install_name @rpath/"+library.sharedLibFilename(ctx),
)
} else {
flags.LinkFlags = append(flags.LinkFlags, "-Wl,-soname="+library.sharedLibFilename(ctx))
}
} }
return flags return flags

5
rust/rust.go
View File

@@ -1224,6 +1224,11 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
if _, exists := skipModuleList[depName]; exists { if _, exists := skipModuleList[depName]; exists {
return return
} }
if depTag == android.DarwinUniversalVariantTag {
return
}
if rustDep, ok := dep.(*Module); ok && !rustDep.CcLibraryInterface() { if rustDep, ok := dep.(*Module); ok && !rustDep.CcLibraryInterface() {
//Handle Rust Modules //Handle Rust Modules
makeLibName := rustMakeLibName(ctx, mod, rustDep, depName+rustDep.Properties.RustSubName) makeLibName := rustMakeLibName(ctx, mod, rustDep, depName+rustDep.Properties.RustSubName)