android: Update to NDK 27

This commit is contained in:
Colin Edwards 2024-04-20 20:43:17 -05:00
parent 964e18ab49
commit cb6f61cf37
4 changed files with 11 additions and 4 deletions

View File

@ -43,11 +43,16 @@ jobs:
quilt
pip3 install --user meson==1.3.0
# todo: remove once NDK 27 is out of beta
- name: Install Beta NDK
run: |
echo y | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;27.0.11718014"
- name: Build
run: |
mkdir -p output/android
cd ./output/android
../../android/build.py $ANDROID_SDK_ROOT $ANDROID_NDK_LATEST_HOME arm64-v8a \
../../android/build.py $ANDROID_SDK_ROOT $ANDROID_SDK_ROOT/ndk/27.0.11718014 arm64-v8a \
--buildtype=debugoptimized -Db_ndebug=true \
-Dwrap_mode=forcefallback

View File

@ -59,7 +59,6 @@ configure_args += [
'-Dandroid_ndk=' + ndk_path,
'-Dandroid_abi=' + android_abi,
'-Dandroid_strip=' + toolchain.strip,
'-Dopenssl:asm=disabled'
]
from build.meson import configure as run_meson

View File

@ -200,7 +200,7 @@ Compiling for Android
You need:
* Android SDK (sdk platform 34, build tools 34.0.0)
* `Android NDK r26b <https://developer.android.com/ndk/downloads>`_
* `Android NDK r27 <https://developer.android.com/ndk/downloads>`_
* `Meson 0.56.0 <http://mesonbuild.com/>`__ and `Ninja
<https://ninja-build.org/>`__
* cmake

View File

@ -85,7 +85,6 @@ project(
'libmpdclient:documentation=false',
'libmpdclient:test=false',
'openssl:build_cli=false',
'openssl:asm=disabled', # work around "call to undeclared function "asm" on Android
'opus:docs=disabled',
'opus:extra-programs=disabled',
'opus:tests=disabled',
@ -267,6 +266,10 @@ if is_windows
endif
if is_android
# With ndk27 libcpp doesn't seem to have a rune table defined for the
# localization module, tell it to use the one it ships with
common_cppflags += ['-D_LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE']
subdir('android')
endif