diff options
| author | 2020-04-28 10:10:23 -0400 | |
|---|---|---|
| committer | 2020-04-29 15:31:34 -0400 | |
| commit | 9d1df10e2a7aacb4ada52000dc299ce8c187330a (patch) | |
| tree | 46e467230778530d2ddac2cdcabccc33e1be757b /rust/library.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/library.go')
| -rw-r--r-- | rust/library.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/library.go b/rust/library.go index bf863bb67..87e816dba 100644 --- a/rust/library.go +++ b/rust/library.go @@ -281,7 +281,7 @@ func (library *libraryDecorator) BuildOnlyShared() { } func NewRustLibrary(hod android.HostOrDeviceSupported) (*Module, *libraryDecorator) { - module := newModule(hod, android.MultilibFirst) + module := newModule(hod, android.MultilibBoth) library := &libraryDecorator{ MutatedProperties: LibraryMutatedProperties{ |