0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add libc++ to apk

Browse source
This commit is contained in:
loonycyborg 2023-05-26 01:57:41 +03:00
parent e756584e49
commit d54ef82370
No known key found for this signature in database
GPG key ID: 6E8233FAB8F26D61
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/android/SConscript
View file

@ -29,7 +29,7 @@ def add_libraries_to_archive(target, source, env):
name = library.name
apk.write(library.path, "lib/armeabi-v7a/" + name)
unaligned = env.Command("wesnoth.apk.unaligned", [apk[0]] + bytecode + env.Glob("$prefix/lib/*.so*") + ["lib/libmain.so"], [
unaligned = env.Command("wesnoth.apk.unaligned", [apk[0]] + bytecode + env.Glob("$prefix/lib/*.so*") + ["$ndkdir/sources/cxx-stl/llvm-libc++/libs/$ANDROID_ABI/libc++_shared.so", "lib/libmain.so"], [
"cp ${SOURCES[0]} $TARGET && zip -j $TARGET ${SOURCES[1]}",
add_libraries_to_archive
])

1
scons/android-ndk.py
View file

@ -26,6 +26,7 @@ def generate(env):
abi_spec = json.load(open(ndk + "/meta/abis.json"))[abi]
print(abi_spec)
env["ANDROID_TOOLCHAIN"] = f"{ndk}/toolchains/llvm/prebuilt/linux-x86_64"
env["ANDROID_ABI"] = abi
env["AR"] = "$ANDROID_TOOLCHAIN/bin/llvm-ar"
env["CC"] = "$ANDROID_TOOLCHAIN/bin/clang"
env["CXX"] = "$ANDROID_TOOLCHAIN/bin/clang++"