diff options
| author | 2021-11-11 09:29:07 -0500 | |
|---|---|---|
| committer | 2021-11-12 08:58:17 -0500 | |
| commit | fba2aa255cd2f2bf33fa29fc937a0c29e11bb7ea (patch) | |
| tree | 8aee4a266390abdcc4bf467626b86fb21fa51644 /rust/testing.go | |
| parent | 45da465ef6eece7e794125d1d4d5223609086b06 (diff) | |
rust: Support new rust_stdlib_prebuilt_host type
Refactor Rust prebuilts to support the new rust_stdlib_prebuilt_host
module type, and change the format for depending on the prebuilt host
stdlibs.
Bug: 140642453
Test: m
Change-Id: Ifbc4741818777934e917631c788b20911856c44a
Diffstat (limited to 'rust/testing.go')
| -rw-r--r-- | rust/testing.go | 76 |
1 files changed, 8 insertions, 68 deletions
diff --git a/rust/testing.go b/rust/testing.go index 94cdd9dcd..dac04d6a8 100644 --- a/rust/testing.go +++ b/rust/testing.go @@ -53,74 +53,14 @@ var PrepareForTestWithRustIncludeVndk = android.GroupFixturePreparers( func GatherRequiredDepsForTest() string { bp := ` rust_prebuilt_library { - name: "libstd_x86_64-unknown-linux-gnu", - crate_name: "std", - rlib: { - srcs: ["libstd.rlib"], - }, - dylib: { - srcs: ["libstd.so"], - }, - host_supported: true, - sysroot: true, - } - rust_prebuilt_library { - name: "libtest_x86_64-unknown-linux-gnu", - crate_name: "test", - rlib: { - srcs: ["libtest.rlib"], - }, - dylib: { - srcs: ["libtest.so"], - }, - host_supported: true, - sysroot: true, - } - rust_prebuilt_library { - name: "libstd_i686-unknown-linux-gnu", - crate_name: "std", - rlib: { - srcs: ["libstd.rlib"], - }, - dylib: { - srcs: ["libstd.so"], - }, - host_supported: true, - sysroot: true, - } - rust_prebuilt_library { - name: "libtest_i686-unknown-linux-gnu", - crate_name: "test", - rlib: { - srcs: ["libtest.rlib"], - }, - dylib: { - srcs: ["libtest.so"], - }, - host_supported: true, - sysroot: true, - } - rust_prebuilt_library { - name: "libstd_x86_64-apple-darwin", - crate_name: "std", - rlib: { - srcs: ["libstd.rlib"], - }, - dylib: { - srcs: ["libstd.so"], - }, - host_supported: true, - sysroot: true, - } - rust_prebuilt_library { - name: "libtest_x86_64-apple-darwin", - crate_name: "test", - rlib: { - srcs: ["libtest.rlib"], - }, - dylib: { - srcs: ["libtest.so"], - }, + name: "libstd", + crate_name: "std", + rlib: { + srcs: ["libstd.rlib"], + }, + dylib: { + srcs: ["libstd.so"], + }, host_supported: true, sysroot: true, } |