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

Provide 32-bit and 64-bit Rust libs by default.

Browse Source 
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
This commit is contained in:
Ivan Lozano
2020-04-28 10:10:23 -04:00
parent 52c0b7b35b
commit 9d1df10e2a
6 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rust/library.go
View File

@@ -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{