diff options
| author | Tatsuyuki Ishi <ishitatsuyuki@gmail.com> | 2023-04-03 13:42:37 +0900 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-04-13 04:28:29 +0000 |
| commit | 36fd2bbd98fdb3c410e8c742d34398a683242bfe (patch) | |
| tree | 5738905faacb05be330edeaa932b8e2b3ca4da28 /.gitlab-ci | |
| parent | 1a63ccc9aa51378676f9c9cf4146c93107feb356 (diff) | |
ci/android: Make armv8's arch aarch64 instead of arm.
Per [1], arm is for 32-bit.
For an upcoming change, we need to detect AArch64 specifically.
Specifying arm in the cross file will result in the wrong build script
behavior.
[1]: https://mesonbuild.com/Reference-tables.html#cpu-families
Reviewed-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22418>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/debian/android_build.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/image-tags.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/container/debian/android_build.sh b/.gitlab-ci/container/debian/android_build.sh index 5aedf26dffb..facc77db18d 100644 --- a/.gitlab-ci/container/debian/android_build.sh +++ b/.gitlab-ci/container/debian/android_build.sh @@ -27,7 +27,7 @@ sh .gitlab-ci/container/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3" sh .gitlab-ci/container/create-android-cross-file.sh /$ndk x86_64-linux-android x86_64 x86_64 $ANDROID_SDK_VERSION sh .gitlab-ci/container/create-android-cross-file.sh /$ndk i686-linux-android x86 x86 $ANDROID_SDK_VERSION -sh .gitlab-ci/container/create-android-cross-file.sh /$ndk aarch64-linux-android arm armv8 $ANDROID_SDK_VERSION +sh .gitlab-ci/container/create-android-cross-file.sh /$ndk aarch64-linux-android aarch64 armv8 $ANDROID_SDK_VERSION sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi arm armv7hl $ANDROID_SDK_VERSION armv7a-linux-androideabi # Not using build-libdrm.sh because we don't want its cleanup after building diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 4e2521ffee2..7845dc591df 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -3,7 +3,7 @@ variables: DEBIAN_BASE_TAG: "2023-03-27-virglrenderer-crosvm" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" - DEBIAN_BUILD_TAG: "2023-02-14-pip" + DEBIAN_BUILD_TAG: "2023-04-03-android-meson-aarch64" DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw" DEBIAN_BUILD_MINGW_TAG: "2023-01-03-ci-libva-2.17" |