diff options
| author | Ivan Lozano <ivanlozano@google.com> | 2020-04-28 10:10:23 -0400 |
|---|---|---|
| committer | Ivan Lozano <ivanlozano@google.com> | 2020-04-29 15:31:34 -0400 |
| commit | 9d1df10e2a7aacb4ada52000dc299ce8c187330a (patch) | |
| tree | 46e467230778530d2ddac2cdcabccc33e1be757b /rust/testing.go | |
| parent | 52c0b7b35b5c5b510bac0a0a98d493b7d953a10d (diff) | |
Provide 32-bit and 64-bit Rust libs by default.
CC libraries which depend on Rust libraries get missing dependency
errors when building 32-bit variants dependent on Rust modules which
don't explicitly have "multilib: both" declared.
Because CC libraries use MultilibBoth by default, Rust should do the
same.
This also fixes a bug where the ARM32 toolchain incorrectly embedded
toolchain64Bit instead of toolchain32Bit.
Bug: 154730212
Test: Rust libraries provide both variants by default.
Change-Id: Ia545fe069d3c6b77c3d18f4f10267e2c72ee0bab
Diffstat (limited to 'rust/testing.go')
| -rw-r--r-- | rust/testing.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/rust/testing.go b/rust/testing.go index c3a462553..aad4ffe35 100644 --- a/rust/testing.go +++ b/rust/testing.go @@ -46,24 +46,29 @@ func GatherRequiredDepsForTest() string { crate_name: "std", srcs: ["foo.rs"], no_stdlibs: true, + host_supported: true, } rust_library_rlib { name: "libstd.static", crate_name: "std", srcs: ["foo.rs"], no_stdlibs: true, + host_supported: true, } rust_library_dylib { name: "libtest", crate_name: "test", srcs: ["foo.rs"], no_stdlibs: true, + host_supported: true, + } rust_library_rlib { name: "libtest.static", crate_name: "test", srcs: ["foo.rs"], no_stdlibs: true, + host_supported: true, } ` + cc.GatherRequiredDepsForTest(android.NoOsType) |