From c5866b1acf923910945944c59219f03a59689720 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 5 Feb 2021 08:29:52 +0100 Subject: [PATCH] try --- frostwire-jlibtorrent/swig/build-android-arm.sh | 4 ++-- frostwire-jlibtorrent/swig/build-android-arm64.sh | 3 ++- frostwire-jlibtorrent/swig/build-android-x86.sh | 1 + frostwire-jlibtorrent/swig/build-android-x86_64.sh | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frostwire-jlibtorrent/swig/build-android-arm.sh b/frostwire-jlibtorrent/swig/build-android-arm.sh index 2a83703..4762955 100755 --- a/frostwire-jlibtorrent/swig/build-android-arm.sh +++ b/frostwire-jlibtorrent/swig/build-android-arm.sh @@ -14,9 +14,9 @@ export SHARED_LIB=lib${LIBRARY_NAME}.so export CXX=g++ export NDK_VERSION=r21d prepare_android_toolchain -export ANDROID_TOOLCHAIN=${NDK}/toolchains/llvm/prebuilt/linux-x86_64/ +export ANDROID_TOOLCHAIN=${NDK}/toolchains/llvm/prebuilt/linux-x86_64 abort_if_var_unset "ANDROID_TOOLCHAIN" ${ANDROID_TOOLCHAIN} -export CC=${ANDROID_TOOLCHAIN}/bin/armv7a-linux-androideabi${android_api}-clang +export CC=${ANDROID_TOOLCHAIN}/bin/armv7a-linux-androideabi${android_api}-clang++ export run_openssl_configure="./Configure linux-${os_arch}v4 ${OPENSSL_NO_OPTS} -march=armv7-a -mfpu=neon -fPIC --prefix=${OPENSSL_ROOT}"; export run_readelf="${ANDROID_TOOLCHAIN}/bin/arm-linux-androideabi-readelf -d bin/release/${os_build}/${os_arch}eabi-v7a/${SHARED_LIB}" export run_bjam="${BOOST_ROOT}/b2 -j8 --user-config=config/${os_build}-${os_arch}-config.jam variant=release toolset=clang-linux-${os_arch} target-os=${os_build} location=bin/release/${os_build}/${os_arch}eabi-v7a" diff --git a/frostwire-jlibtorrent/swig/build-android-arm64.sh b/frostwire-jlibtorrent/swig/build-android-arm64.sh index 2b454f7..74b2430 100755 --- a/frostwire-jlibtorrent/swig/build-android-arm64.sh +++ b/frostwire-jlibtorrent/swig/build-android-arm64.sh @@ -14,8 +14,9 @@ export SHARED_LIB=lib${LIBRARY_NAME}.so export CXX=g++ export NDK_VERSION=r21d prepare_android_toolchain +export ANDROID_TOOLCHAIN=${NDK}/toolchains/llvm/prebuilt/linux-x86_64 abort_if_var_unset "ANDROID_TOOLCHAIN" ${ANDROID_TOOLCHAIN} -export CC=$ANDROID_TOOLCHAIN/bin/aarch64-linux-android-clang +export CC=${ANDROID_TOOLCHAIN}/bin/aarch64-linux-androideabi${android_api}-clang++ export run_openssl_configure="./Configure linux-aarch64 ${OPENSSL_NO_OPTS} -march=armv8-a+crypto -mfpu=neon -fPIC --prefix=${OPENSSL_ROOT}"; export run_readelf="${ANDROID_TOOLCHAIN}/bin/aarch64-linux-android-readelf -d bin/release/${os_build}/${os_arch}-v8a/${SHARED_LIB}" export run_bjam="${BOOST_ROOT}/b2 -j8 --user-config=config/${os_build}-${os_arch}-config.jam variant=release toolset=clang-${os_arch} target-os=${os_build} location=bin/release/${os_build}/${os_arch}-v8a" diff --git a/frostwire-jlibtorrent/swig/build-android-x86.sh b/frostwire-jlibtorrent/swig/build-android-x86.sh index b1df292..15026a8 100755 --- a/frostwire-jlibtorrent/swig/build-android-x86.sh +++ b/frostwire-jlibtorrent/swig/build-android-x86.sh @@ -14,6 +14,7 @@ export SHARED_LIB=lib${LIBRARY_NAME}.so export CXX=g++ export NDK_VERSION=r21d prepare_android_toolchain +export ANDROID_TOOLCHAIN=${NDK}/toolchains/llvm/prebuilt/linux-x86_64 abort_if_var_unset "ANDROID_TOOLCHAIN" ${ANDROID_TOOLCHAIN} export run_openssl_configure="./Configure linux-elf ${OPENSSL_NO_OPTS} -fPIC -mstackrealign --prefix=${OPENSSL_ROOT}" export run_readelf="${ANDROID_TOOLCHAIN}/bin/i686-linux-android-readelf -d bin/release/${os_build}/${os_arch}/${SHARED_LIB}" diff --git a/frostwire-jlibtorrent/swig/build-android-x86_64.sh b/frostwire-jlibtorrent/swig/build-android-x86_64.sh index 5bf15ea..f0b4853 100755 --- a/frostwire-jlibtorrent/swig/build-android-x86_64.sh +++ b/frostwire-jlibtorrent/swig/build-android-x86_64.sh @@ -14,6 +14,7 @@ export SHARED_LIB=lib${LIBRARY_NAME}.so export CXX=g++ export NDK_VERSION=r21d prepare_android_toolchain +export ANDROID_TOOLCHAIN=${NDK}/toolchains/llvm/prebuilt/linux-x86_64 abort_if_var_unset "ANDROID_TOOLCHAIN" ${ANDROID_TOOLCHAIN} export run_openssl_configure="./Configure linux-x86_64 ${OPENSSL_NO_OPTS} -fPIC -mstackrealign --prefix=${OPENSSL_ROOT}"; export run_readelf="${ANDROID_TOOLCHAIN}/bin/i686-linux-android-readelf -d bin/release/${os_build}/${os_arch}/${SHARED_LIB}"