From ba5a18ace4a77ec98e7a288b775f36ee60ec4c2f Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 21 Feb 2020 21:10:53 +0530 Subject: [PATCH] gitlab-ci: 64-bit ARM is aarch64, not arm64 We also already have conditionals using `aarch64` in the build files, so `arm64` is completely wrong. https://mesonbuild.com/Reference-tables.html#cpu-families --- .gitlab-ci/android-setup-env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/android-setup-env.sh b/.gitlab-ci/android-setup-env.sh index d922bfdbe..60a86de19 100755 --- a/.gitlab-ci/android-setup-env.sh +++ b/.gitlab-ci/android-setup-env.sh @@ -82,8 +82,8 @@ chmod +x $PKG_CONFIG cat > cross_file_android_${arch}_${api}.txt <<- EOM [host_machine] system = 'android' -cpu_family = 'arm64' -cpu = 'arm64' +cpu_family = 'aarch64' +cpu = 'aarch64' endian = 'little' [properties]