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

Merge "rust: Make dylib-std the canonical rlib form"

Browse Source
This commit is contained in:
Ivan Lozano
2023-06-16 00:39:55 +00:00
committed by Gerrit Code Review
parent 0e7d0fa05c 4df0257fe5
commit 85cc859d73
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rust/library.go
View File

@@ -25,8 +25,7 @@ import (
) )
var ( var (
DylibStdlibSuffix = ".dylib-std" RlibStdlibSuffix = ".rlib-std"
RlibStdlibSuffix = ".rlib-std"
) )
func init() { func init() {
@@ -756,7 +755,6 @@ func LibstdMutator(mctx android.BottomUpMutatorContext) {
dylib.Disable() dylib.Disable()
} }
rlib.Properties.RustSubName += RlibStdlibSuffix rlib.Properties.RustSubName += RlibStdlibSuffix
dylib.Properties.RustSubName += DylibStdlibSuffix
} }
} }
} }

4
rust/library_test.go
View File

@@ -247,10 +247,10 @@ func TestAutoDeps(t *testing.T) {
if !android.InList("libbar", dyn.Module().(*Module).Properties.AndroidMkDylibs) { if !android.InList("libbar", dyn.Module().(*Module).Properties.AndroidMkDylibs) {
t.Errorf("libbar not present as dynamic dependency in dynamic lib") t.Errorf("libbar not present as dynamic dependency in dynamic lib")
} }
if android.InList("libbar.dylib-std", dyn.Module().(*Module).Properties.AndroidMkRlibs) { if android.InList("libbar", dyn.Module().(*Module).Properties.AndroidMkRlibs) {
t.Errorf("libbar present as rlib dependency in dynamic lib") t.Errorf("libbar present as rlib dependency in dynamic lib")
} }
if !android.InList("librlib_only.dylib-std", dyn.Module().(*Module).Properties.AndroidMkRlibs) { if !android.InList("librlib_only", dyn.Module().(*Module).Properties.AndroidMkRlibs) {
t.Errorf("librlib_only should be selected by rustlibs as an rlib.") t.Errorf("librlib_only should be selected by rustlibs as an rlib.")
} }
} }

4
rust/rust_test.go
View File

@@ -377,11 +377,11 @@ func TestSourceProviderDeps(t *testing.T) {
// Check that our bindings are picked up as crate dependencies as well // Check that our bindings are picked up as crate dependencies as well
libfooMod := ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_dylib").Module().(*Module) libfooMod := ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_dylib").Module().(*Module)
if !android.InList("libbindings.dylib-std", libfooMod.Properties.AndroidMkRlibs) { if !android.InList("libbindings", libfooMod.Properties.AndroidMkRlibs) {
t.Errorf("bindgen dependency not detected as a rlib dependency (dependency missing from AndroidMkRlibs)") t.Errorf("bindgen dependency not detected as a rlib dependency (dependency missing from AndroidMkRlibs)")
} }
fizzBuzzMod := ctx.ModuleForTests("fizz-buzz-dep", "android_arm64_armv8-a").Module().(*Module) fizzBuzzMod := ctx.ModuleForTests("fizz-buzz-dep", "android_arm64_armv8-a").Module().(*Module)
if !android.InList("libbindings.dylib-std", fizzBuzzMod.Properties.AndroidMkRlibs) { if !android.InList("libbindings", fizzBuzzMod.Properties.AndroidMkRlibs) {
t.Errorf("bindgen dependency not detected as a rlib dependency (dependency missing from AndroidMkRlibs)") t.Errorf("bindgen dependency not detected as a rlib dependency (dependency missing from AndroidMkRlibs)")
} }
libprocmacroMod := ctx.ModuleForTests("libprocmacro", "linux_glibc_x86_64").Module().(*Module) libprocmacroMod := ctx.ModuleForTests("libprocmacro", "linux_glibc_x86_64").Module().(*Module)