summaryrefslogtreecommitdiff
path: root/rust/library_test.go
diff options
context:
space:
mode:
author Ivan Lozano <ivanlozano@google.com> 2024-12-17 06:11:15 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-12-17 06:11:15 -0800
commitb2b1d2e4f409008d7a83350d066bf26ce08018b1 (patch)
tree61134787de6239fa27ee8741da0f4c6d74f2a4fc /rust/library_test.go
parentaea639d61264b9b22027d8c274180883d1143ea7 (diff)
parent61848425fcb3c5952c96b12618836a04c1442aa5 (diff)
Merge "rust: Remove rust_ffi_rlibs, keep rust_ffi_static" into main
Diffstat (limited to 'rust/library_test.go')
-rw-r--r--rust/library_test.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/rust/library_test.go b/rust/library_test.go
index adbf4feff..256cb355c 100644
--- a/rust/library_test.go
+++ b/rust/library_test.go
@@ -202,9 +202,9 @@ func TestStaticLibraryLinkage(t *testing.T) {
func TestNativeDependencyOfRlib(t *testing.T) {
ctx := testRust(t, `
- rust_ffi_rlib {
- name: "libffi_rlib",
- crate_name: "ffi_rlib",
+ rust_ffi_static {
+ name: "libffi_static",
+ crate_name: "ffi_static",
rlibs: ["librust_rlib"],
srcs: ["foo.rs"],
}
@@ -227,7 +227,7 @@ func TestNativeDependencyOfRlib(t *testing.T) {
rustRlibRlibStd := ctx.ModuleForTests("librust_rlib", "android_arm64_armv8-a_rlib_rlib-std")
rustRlibDylibStd := ctx.ModuleForTests("librust_rlib", "android_arm64_armv8-a_rlib_dylib-std")
- ffiRlib := ctx.ModuleForTests("libffi_rlib", "android_arm64_armv8-a_rlib_rlib-std")
+ ffiRlib := ctx.ModuleForTests("libffi_static", "android_arm64_armv8-a_rlib_rlib-std")
modules := []android.TestingModule{
rustRlibRlibStd,
@@ -412,10 +412,10 @@ func TestLibstdLinkage(t *testing.T) {
t.Errorf("Device rust_ffi_shared does not link libstd as an dylib")
}
if !android.InList("libstd", libbarFFIRlib.Properties.AndroidMkRlibs) {
- t.Errorf("Device rust_ffi_rlib does not link libstd as an rlib")
+ t.Errorf("Device rust_ffi_static does not link libstd as an rlib")
}
if !android.InList("libfoo.rlib-std", libbarFFIRlib.Properties.AndroidMkRlibs) {
- t.Errorf("Device rust_ffi_rlib does not link dependent rustlib rlib-std variant")
+ t.Errorf("Device rust_ffi_static does not link dependent rustlib rlib-std variant")
}
if !android.InList("libstd", libbarRlibStd.Properties.AndroidMkRlibs) {
t.Errorf("rust_ffi with prefer_rlib does not link libstd as an rlib")