From 1c0d14587415cdc6f8f3eb95bf348ce8570f2c1e Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 8 Aug 2025 15:59:59 +0500 Subject: [PATCH] filesystem: restore lib prefix on Android, otherwise Android won't unpack the libraries --- filesystem/wscript | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/filesystem/wscript b/filesystem/wscript index 6a9039a6..b80ec79e 100644 --- a/filesystem/wscript +++ b/filesystem/wscript @@ -19,9 +19,10 @@ def configure(conf): if conf.env.DEST_OS == 'android': conf.check_cc(lib='android') - # remove lib prefix - if conf.env.cxxshlib_PATTERN.startswith('lib'): - conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:] + # remove lib prefix, except on Android which has issues unpacking libraries without prefix when debuggable=false + if conf.env.DEST_OS != 'android': + if conf.env.cxxshlib_PATTERN.startswith('lib'): + conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:] if conf.check_cc(fragment=MEMFD_CREATE_TEST, msg='Checking for memfd_create', mandatory=False): conf.define('HAVE_MEMFD_CREATE', 1)