From 59ef70129872de1e54c7af24d9222dce2aa23d3d Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 7 Dec 2021 23:03:37 +0100 Subject: [PATCH] makepanda: Add back accidentally removed libc++_shared.so on Android --- makepanda/makepandacore.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 9f4767abec..5d10f736df 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -2542,6 +2542,11 @@ def SdkLocateAndroid(): SDK["SYSROOT"] = os.path.join(ndk_root, 'platforms', 'android-%s' % (api), arch_dir).replace('\\', '/') #IncDirectory("ALWAYS", os.path.join(SDK["SYSROOT"], 'usr', 'include')) + # We need to redistribute the C++ standard library. + stdlibc = os.path.join(ndk_root, 'sources', 'cxx-stl', 'llvm-libc++') + stl_lib = os.path.join(stdlibc, 'libs', abi, 'libc++_shared.so') + CopyFile(os.path.join(GetOutputDir(), 'lib', 'libc++_shared.so'), stl_lib) + # The Android support library polyfills C++ features not available in the # STL that ships with Android. support = os.path.join(ndk_root, 'sources', 'android', 'support', 'include')