diff --git a/rust/library.go b/rust/library.go index a3a567281..ca5ad1443 100644 --- a/rust/library.go +++ b/rust/library.go @@ -25,8 +25,7 @@ import ( ) var ( - DylibStdlibSuffix = ".dylib-std" - RlibStdlibSuffix = ".rlib-std" + RlibStdlibSuffix = ".rlib-std" ) func init() { @@ -756,7 +755,6 @@ func LibstdMutator(mctx android.BottomUpMutatorContext) { dylib.Disable() } rlib.Properties.RustSubName += RlibStdlibSuffix - dylib.Properties.RustSubName += DylibStdlibSuffix } } } diff --git a/rust/library_test.go b/rust/library_test.go index d4b525f2e..add7173bc 100644 --- a/rust/library_test.go +++ b/rust/library_test.go @@ -247,10 +247,10 @@ func TestAutoDeps(t *testing.T) { if !android.InList("libbar", dyn.Module().(*Module).Properties.AndroidMkDylibs) { 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") } - 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.") } } diff --git a/rust/rust_test.go b/rust/rust_test.go index 2a38b8983..64f90b6e0 100644 --- a/rust/rust_test.go +++ b/rust/rust_test.go @@ -377,11 +377,11 @@ func TestSourceProviderDeps(t *testing.T) { // Check that our bindings are picked up as crate dependencies as well 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)") } 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)") } libprocmacroMod := ctx.ModuleForTests("libprocmacro", "linux_glibc_x86_64").Module().(*Module)