From 91123983adb8703dd0780084448f0a9224473aeb Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 21 Mar 2023 09:46:25 +0100 Subject: [PATCH] Revert "python/build/meson.py: keep Meson from executing Android-x86 test binaries" This reverts commit 8ab2722300f680fc693677eee66194e963dd4ec9. The "needs_exe_wrapper" setting was already there, and the new one was misplaced, it belongs in "[properties]". --- python/build/meson.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/python/build/meson.py b/python/build/meson.py index 8afdcb43e..0e19b6f9f 100644 --- a/python/build/meson.py +++ b/python/build/meson.py @@ -69,12 +69,6 @@ c_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())} cpp_args = {repr((toolchain.cppflags + ' ' + toolchain.cxxflags).split())} cpp_link_args = {repr(toolchain.ldflags.split() + toolchain.libs.split())} -""") - - if 'android' in toolchain.actual_arch: - f.write(""" -# Keep Meson from executing Android-x86 test binaries -needs_exe_wrapper = true """) f.write(f"""