Fix Android build error: needs_exe_wrapper

lib/src/libmpdclient-2.19/meson.build:1:0: ERROR: Unknown options: "needs_exe_wrapper" The "needs_exe_wrapper" option was incorrectly set under [built-in options] rather than [properties].

Fix Android build error: needs_exe_wrapper
fbecb05b · Sam Bazley · Max Kellermann · 49837033 · fbecb05b
Commit fbecb05b authored Dec 26, 2021 by Sam Bazley Committed by Max Kellermann Jan 11, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

meson.py python/build/meson.py +8 -6

No files found.
--- a/python/build/meson.py
+++ b/python/build/meson.py
@@ -53,7 +53,15 @@ pkgconfig = '{toolchain.pkg_config}'
        f.write(f"""
 [properties]
 root = '{toolchain.install_prefix}'
+""")
+
+        if 'android' in toolchain.arch:
+            f.write("""
+# Keep Meson from executing Android-x86 test binariees
+needs_exe_wrapper = true
+""")

+        f.write(f"""
 [built-in options]
 c_args = {repr((toolchain.cppflags + ' ' + toolchain.cflags).split())}
 c_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())}
@@ -62,12 +70,6 @@ cpp_args = {repr((toolchain.cppflags + ' ' + toolchain.cxxflags).split())}
 cpp_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())}
 """)

-        if 'android' in toolchain.arch:
-            f.write("""
-# Keep Meson from executing Android-x86 test binariees
-needs_exe_wrapper = true
-""")
-
        f.write(f"""
 [host_machine]
 system = '{system}'