Merge "rust: Support new rust_stdlib_prebuilt_host type"

This commit is contained in:
Ivan Lozano
2021-11-12 19:35:03 +00:00
committed by Gerrit Code Review
5 changed files with 40 additions and 70 deletions

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