Merge pull request #70196 from matthewbauer/add-android32-cross-trunk

top-level/release-cross.nix: add android32
This commit is contained in:
Matthew Bauer 2019-10-01 13:40:12 -04:00 committed by GitHub
commit 657b7d06c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -143,9 +143,8 @@ in
x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon; x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon;
/* Linux on Aarch64 */ android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt linuxCommon;
android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt (linuxCommon // { android32 = mapTestOnCross lib.systems.examples.armv7a-android-prebuilt linuxCommon;
});
wasi32 = mapTestOnCross lib.systems.examples.wasi32 wasiCommon; wasi32 = mapTestOnCross lib.systems.examples.wasi32 wasiCommon;