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

android: Always force wrap deps 

This ensures that android is always built with the deps we build
with wrap.

Also put back the asm disable for openssl since the version we use needs
that flag
This commit is contained in:
Colin Edwards 2024-04-23 17:24:54 -05:00
parent cb6f61cf37
commit 57e26eb832
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/build.py
View File

@ -59,6 +59,8 @@ 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',
'-Dwrap_mode=forcefallback'
] ]
from build.meson import configure as run_meson from build.meson import configure as run_meson

1
meson.build
View File

@ -85,6 +85,7 @@ project(
'libmpdclient:documentation=false', 'libmpdclient:documentation=false',
'libmpdclient:test=false', 'libmpdclient:test=false',
'openssl:build_cli=false', 'openssl:build_cli=false',
'openssl:asm=disabled',
'opus:docs=disabled', 'opus:docs=disabled',
'opus:extra-programs=disabled', 'opus:extra-programs=disabled',
'opus:tests=disabled', 'opus:tests=disabled',