From 57abef5af1f316bc1e9c6baefe986950e65b516b Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Thu, 18 Apr 2024 08:41:47 -0400 Subject: [PATCH] docs/android: Fix example meson cross file The system needs to be android, or else we run into the libarchive build error fixed in 735fe243a773cc3a13d0f4afedd0adb8f1bbd36f: In file included from ../subprojects/libarchive-3.7.2/libarchive/archive_write_open_memory.c:33: ../subprojects/libarchive-3.7.2/libarchive/archive.h:101:10: fatal error: 'android_lf.h' file not found Also, it uses the aarch64 clang but "cpu = 'armv8'", which doesn't work (armv8 is the 32-bit version). Use aarch64 as presumably intended. Part-of: --- docs/android.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/android.rst b/docs/android.rst index c26d6cb309365..5f690994ad9f2 100644 --- a/docs/android.rst +++ b/docs/android.rst @@ -33,9 +33,9 @@ Then, create your Meson cross file to use it, something like this pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=NDKDIR/pkgconfig', '/usr/bin/pkg-config'] [host_machine] - system = 'linux' + system = 'android' cpu_family = 'arm' - cpu = 'armv8' + cpu = 'aarch64' endian = 'little' Now, use that cross file for your Android build directory (as in this