Peertube
/
TubeLab-App-Android
mirror of https://framagit.org/tom79/fedilab-tube
1
0
Fork 0
Code Issues Releases Wiki Activity

try

This commit is contained in:
Thomas 2021-02-05 10:28:31 +01:00
parent d4270a3ef9
commit c2225bca37
2 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frostwire-jlibtorrent/swig/build-android-arm.sh
View File

@ -41,7 +41,6 @@ else
prepare_boost
prepare_openssl
build_openssl
prepare_android_standalone_toolchain
export CC=${ANDROID_TOOLCHAIN}/bin/armv7a-linux-androideabi${android_api}-clang++
prepare_libtorrent
./run-swig.sh

40
frostwire-jlibtorrent/swig/build-utils.shinc
View File

@ -91,6 +91,7 @@ check_min_req_vars() {
}
prepare_boost() {
echo "***** PREPARE BOOST ******"
abort_if_var_unset "BOOST_ROOT" ${BOOST_ROOT}
abort_if_var_unset "BOOST_VERSION" ${BOOST_VERSION}
abort_if_var_unset "BOOST_MAJOR" ${BOOST_MAJOR}
@ -116,6 +117,7 @@ prepare_boost() {
./b2 /headers
popd
popd
echo "-------- PREPARE BOOST DONE --------"
}
download_android_ndk() {
@ -140,7 +142,7 @@ prepare_android_toolchain() {
host_os="darwin"
fi
download_android_ndk
export NDK=$PWD/android-ndk-${NDK_VERSION}
@ -152,42 +154,9 @@ prepare_android_toolchain() {
popd
}
prepare_android_standalone_toolchain() {
abort_if_var_unset "SRC" ${SRC}
abort_if_var_unset "NDK_VERSION" ${NDK_VERSION}
abort_if_var_unset "os_arch" ${os_arch}
abort_if_var_unset "android_api" ${android_api}
pushd ${SRC}
host_os="linux"
if [[ "$OSTYPE" == "darwin"* ]]; then
host_os="darwin"
fi
download_android_ndk
export NDK=$PWD/android-ndk-${NDK_VERSION}
prompt_msg "NDK=${NDK}"
if [ -d standalone_toolchain ]; then
rm -fr standalone_toolchain
fi
#try this command to get path of the prebuilt toolchain in the warnings
$NDK/build/tools/make_standalone_toolchain.py --arch ${os_arch} --api ${android_api} --stl libc++ --install-dir standalone_toolchain
#./build/tools/make_standalone_toolchain.py --arch x86 --api 21 --stl libc++ --install-dir standalone_toolchain
#./build/tools/make_standalone_toolchain.py --arch x86_64 --api 21 --stl libc++ --install-dir standalone_toolchain
#./build/tools/make_standalone_toolchain.py --arch arm --api 21 --stl libc++ --install-dir standalone_toolchain
#./build/tools/make_standalone_toolchain.py --arch arm64 --api 21 --stl libc++ --install-dir standalone_toolchain
# Use the standalone toolchain path
export ANDROID_TOOLCHAIN=${PWD}/standalone_toolchain
prompt_msg "prepare_android_standalone_toolchain: ANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN}"
popd
}
prepare_openssl() {
echo "***** PREPARE OPENSSL ******"
abort_if_var_unset "SRC" ${SRC}
abort_if_var_unset "OPENSSL_VERSION" ${OPENSSL_VERSION}
abort_if_var_unset "OPENSSL_SOURCE" ${OPENSSL_SOURCE}
@ -200,6 +169,7 @@ prepare_openssl() {
rm -f openssl.tar.gz
popd
fi
echo "----- PREPARE OPENSSL DONE -----"
}
build_openssl() {