diff options
| author | 2021-11-12 19:35:03 +0000 | |
|---|---|---|
| committer | 2021-11-12 19:35:03 +0000 | |
| commit | 52a3e36c9293f942801c895d8dd7d0d5aed92f2e (patch) | |
| tree | 08a56c65f02a4340801bf3903f7c04a25213b1fe /rust/testing.go | |
| parent | 94e8a651fa70e2e6819fb959214dce1ae401f578 (diff) | |
| parent | fba2aa255cd2f2bf33fa29fc937a0c29e11bb7ea (diff) | |
Merge "rust: Support new rust_stdlib_prebuilt_host type"
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 abcf23544..9f8ed54d9 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, } |