diff options
| author | 2024-12-13 19:45:00 +0000 | |
|---|---|---|
| committer | 2024-12-16 18:53:45 +0000 | |
| commit | 61848425fcb3c5952c96b12618836a04c1442aa5 (patch) | |
| tree | c789c3ea84f01391b8bbb294f21050c52eccb6f1 /rust/library_test.go | |
| parent | 806efd3885d6eecfa1b1bd1697431c0ab073a76a (diff) | |
rust: Remove rust_ffi_rlibs, keep rust_ffi_static
rust_ffi_static and rust_ffi_rlibs both alias to rust_library_rlib now.
We need to think about whether we need these aliases at all.
There are no users of rust_ffi_rlibs at the moment as developers are
continuing to declare rust_ffi_static modules. Let's remove this alias
in the meantime at least to simplify things.
Bug: 350633786
Bug: 383552450
Test: m blueprint_tests && m rust
Change-Id: I6be895ddbffc5ac6303f2edc9ab20f7c20cd1591
Diffstat (limited to 'rust/library_test.go')
| -rw-r--r-- | rust/library_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rust/library_test.go b/rust/library_test.go index 35a420cd5..45c0ed692 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") |