oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

android: require NDK r26b 

This fixes `no member named 'invocable' in namespace 'std'`
This commit is contained in:
Colin Edwards 2023-12-13 12:01:30 -06:00
parent 3284a61f43
commit 8d6f503e04
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/build.py
View File

@ -1,6 +1,7 @@
#!/usr/bin/env -S python3 -u #!/usr/bin/env -S python3 -u
import os, os.path import os, os.path
import shutil
import sys, subprocess import sys, subprocess
if len(sys.argv) < 4: if len(sys.argv) < 4:
@ -60,8 +61,11 @@ configure_args += [
'-Dandroid_ndk=' + ndk_path, '-Dandroid_ndk=' + ndk_path,
'-Dandroid_abi=' + android_abi, '-Dandroid_abi=' + android_abi,
'-Dandroid_strip=' + toolchain.strip, '-Dandroid_strip=' + toolchain.strip,
'-Dopenssl:asm=disabled'
] ]
from build.meson import configure as run_meson from build.meson import configure as run_meson
run_meson(toolchain, mpd_path, '.', configure_args) run_meson(toolchain, mpd_path, '.', configure_args)
subprocess.check_call(['/usr/bin/ninja'], env=toolchain.env)
ninja = shutil.which("ninja")
subprocess.check_call([ninja], env=toolchain.env)

3
doc/user.rst
View File

@ -197,7 +197,7 @@ Compiling for Android
You need: You need:
* Android SDK (sdk platform 29, build tools 29.0.3) * Android SDK (sdk platform 29, build tools 29.0.3)
* `Android NDK r25b <https://developer.android.com/ndk/downloads>`_ * `Android NDK r26b <https://developer.android.com/ndk/downloads>`_
* `Meson 0.56.0 <http://mesonbuild.com/>`__ and `Ninja * `Meson 0.56.0 <http://mesonbuild.com/>`__ and `Ninja
<https://ninja-build.org/>`__ <https://ninja-build.org/>`__
* cmake * cmake
@ -207,6 +207,7 @@ You need:
* zip * zip
* libtool * libtool
* rsvg-convert * rsvg-convert
* python 3.9+
Just like with the native build, unpack the :program:`MPD` source Just like with the native build, unpack the :program:`MPD` source
tarball and change into the directory. Then, instead of tarball and change into the directory. Then, instead of