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

rust: Support new rust_stdlib_prebuilt_host type

Browse Source 
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
This commit is contained in:
Ivan Lozano
2021-11-11 09:29:07 -05:00
parent 45da465ef6
commit fba2aa255c
5 changed files with 40 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
rust/testing.go
View File

@@ -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,
}