diff options
| author | 2020-06-16 01:25:27 -0700 | |
|---|---|---|
| committer | 2020-06-17 13:08:00 -0700 | |
| commit | e728a8980797ad4f3ed252aa960d8f3832b6b1af (patch) | |
| tree | a32cb3506b4d035b8a1ea55236b0b34cef175c4f /rust/test.go | |
| parent | 0f688004b118c759ec6453a13ebeff742906e0d4 (diff) | |
Generate multilib for rust_test
* Cannot generate multilib for host tests yet.
Bug: 158677299
Test: atest -c -m --include-subdirs external/rust/crates
Change-Id: I7071c1ea30865a8cf268dfe270f2a586eb7710d9
Diffstat (limited to 'rust/test.go')
| -rw-r--r-- | rust/test.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/rust/test.go b/rust/test.go index f616c06f3..416c557d8 100644 --- a/rust/test.go +++ b/rust/test.go @@ -57,7 +57,14 @@ func (test *testDecorator) nativeCoverage() bool { } func NewRustTest(hod android.HostOrDeviceSupported) (*Module, *testDecorator) { - module := newModule(hod, android.MultilibFirst) + // Build both 32 and 64 targets for device tests. + // Cannot build both for host tests yet if the test depends on + // something like proc-macro2 that cannot be built for both. + multilib := android.MultilibBoth + if hod != android.DeviceSupported && hod != android.HostAndDeviceSupported { + multilib = android.MultilibFirst + } + module := newModule(hod, multilib) test := &testDecorator{ binaryDecorator: &binaryDecorator{ |