diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-21 21:10:53 +0530 |
|---|---|---|
| committer | Philip Withnall <withnall@endlessm.com> | 2020-02-24 10:24:02 +0000 |
| commit | ba5a18ace4a77ec98e7a288b775f36ee60ec4c2f (patch) | |
| tree | 8455b183271fc5fb56022f0c762b2739c9353783 /.gitlab-ci | |
| parent | 73d557981d21b7926af6d94d6919a5ef1f311673 (diff) | |
| download | glib-ba5a18ace4a77ec98e7a288b775f36ee60ec4c2f.tar.gz | |
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
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/android-setup-env.sh | 4 |
1 files 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] |