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

[Rust] cdylibs can now link against dylibs.

Browse Source 
Bug: 144861059
Test: cd external/rust/crates; mma
Test: Manual verification through ldd that libstd is a dependency
Change-Id: I603cf519215317aa8c400cd0f6ebb1b58f5bcf15
This commit is contained in:
Ivan Lozano
2020-06-19 12:32:30 -04:00
parent 2752d926a9
commit 7e741cca30
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rust/library_test.go
View File

@@ -17,6 +17,8 @@ package rust
import (
"strings"
"testing"
"android/soong/android"
)
// Test that variants are being generated correctly, and that crate-types are correct.
@@ -115,16 +117,24 @@ func TestValidateLibraryStem(t *testing.T) {
}
func TestSharedLibraryFlags(t *testing.T) {
func TestSharedLibrary(t *testing.T) {
ctx := testRust(t, `
rust_library_host {
rust_library {
name: "libfoo",
srcs: ["foo.rs"],
crate_name: "foo",
}`)
libfooShared := ctx.ModuleForTests("libfoo", "linux_glibc_x86_64_shared").Output("libfoo.so")
if !strings.Contains(libfooShared.Args["linkFlags"], "-Wl,-soname=libfoo.so") {
t.Errorf("missing expected -Wl,-soname linker flag for libfoo shared lib, linkFlags: %#v", libfooShared.Args["linkFlags"])
libfoo := ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_shared")
libfooOutput := libfoo.Output("libfoo.so")
if !strings.Contains(libfooOutput.Args["linkFlags"], "-Wl,-soname=libfoo.so") {
t.Errorf("missing expected -Wl,-soname linker flag for libfoo shared lib, linkFlags: %#v",
libfooOutput.Args["linkFlags"])
}
if !android.InList("libstd", libfoo.Module().(*Module).Properties.AndroidMkDylibs) {
t.Errorf("Non-static libstd dylib expected to be a dependency of Rust shared libraries. Dylib deps are: %#v",
libfoo.Module().(*Module).Properties.AndroidMkDylibs)
}
}