Merge branch 'fix-cpu-family-in-ci' into 'master'

gitlab-ci: 64-bit ARM is aarch64, not arm64

See merge request GNOME/glib!1376
This commit is contained in:
Philip Withnall 2020-02-24 11:18:11 +00:00
commit 97f9fc62c1

View File

@ -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]