makepanda: Add back accidentally removed libc++_shared.so on Android

This commit is contained in:
rdb 2021-12-07 23:03:37 +01:00
parent 44e10d10a0
commit 59ef701298

View File

@ -2542,6 +2542,11 @@ def SdkLocateAndroid():
SDK["SYSROOT"] = os.path.join(ndk_root, 'platforms', 'android-%s' % (api), arch_dir).replace('\\', '/') SDK["SYSROOT"] = os.path.join(ndk_root, 'platforms', 'android-%s' % (api), arch_dir).replace('\\', '/')
#IncDirectory("ALWAYS", os.path.join(SDK["SYSROOT"], 'usr', 'include')) #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 # The Android support library polyfills C++ features not available in the
# STL that ships with Android. # STL that ships with Android.
support = os.path.join(ndk_root, 'sources', 'android', 'support', 'include') support = os.path.join(ndk_root, 'sources', 'android', 'support', 'include')