From 57e26eb832c3e3ec45128520aefc46bb6f2bd64a Mon Sep 17 00:00:00 2001
From: Colin Edwards <colin@recursivepenguin.com>
Date: Tue, 23 Apr 2024 17:24:54 -0500
Subject: [PATCH] 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
---
 android/build.py | 2 ++
 meson.build      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/android/build.py b/android/build.py
index 1050a0f12..62225a19a 100755
--- a/android/build.py
+++ b/android/build.py
@@ -59,6 +59,8 @@ configure_args += [
     '-Dandroid_ndk=' + ndk_path,
     '-Dandroid_abi=' + android_abi,
     '-Dandroid_strip=' + toolchain.strip,
+    '-Dopenssl:asm=disabled',
+    '-Dwrap_mode=forcefallback'
 ]
 
 from build.meson import configure as run_meson
diff --git a/meson.build b/meson.build
index d4bfdf92d..e54250839 100644
--- a/meson.build
+++ b/meson.build
@@ -85,6 +85,7 @@ project(
     'libmpdclient:documentation=false',
     'libmpdclient:test=false',
     'openssl:build_cli=false',
+    'openssl:asm=disabled',
     'opus:docs=disabled',
     'opus:extra-programs=disabled',
     'opus:tests=disabled',