From cd68de6274d18aa8d7ba500a33547311143ed053 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 5 Feb 2021 09:18:34 +0100 Subject: [PATCH] try --- frostwire-jlibtorrent/swig/build-android-arm.sh | 3 ++- 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(+), 2 deletions(-) diff --git a/frostwire-jlibtorrent/swig/build-android-arm.sh b/frostwire-jlibtorrent/swig/build-android-arm.sh index 4762955..09b5564 100755 --- a/frostwire-jlibtorrent/swig/build-android-arm.sh +++ b/frostwire-jlibtorrent/swig/build-android-arm.sh @@ -16,8 +16,9 @@ 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/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}"; +mkdir -p bin/release/${os_build}/${os_arch}eabi-v7a/ 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" export run_strip="${ANDROID_TOOLCHAIN}/bin/arm-linux-androideabi-strip --strip-unneeded -x -g bin/release/${os_build}/${os_arch}eabi-v7a/${SHARED_LIB}" diff --git a/frostwire-jlibtorrent/swig/build-android-arm64.sh b/frostwire-jlibtorrent/swig/build-android-arm64.sh index 74b2430..c895ddc 100755 --- a/frostwire-jlibtorrent/swig/build-android-arm64.sh +++ b/frostwire-jlibtorrent/swig/build-android-arm64.sh @@ -16,7 +16,8 @@ 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-androideabi${android_api}-clang++ +export CC=${ANDROID_TOOLCHAIN}/bin/aarch64-linux-android${android_api}-clang +mkdir -p bin/release/${os_build}/${os_arch}-v8a/${SHARED_LIB} 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 15026a8..910fb40 100755 --- a/frostwire-jlibtorrent/swig/build-android-x86.sh +++ b/frostwire-jlibtorrent/swig/build-android-x86.sh @@ -16,6 +16,7 @@ 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} +mkdir -p bin/release/${os_build}/${os_arch}/${SHARED_LIB} 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}" export run_bjam="${BOOST_ROOT}/b2 -j8 -q --debug-building --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}" diff --git a/frostwire-jlibtorrent/swig/build-android-x86_64.sh b/frostwire-jlibtorrent/swig/build-android-x86_64.sh index f0b4853..440ca1b 100755 --- a/frostwire-jlibtorrent/swig/build-android-x86_64.sh +++ b/frostwire-jlibtorrent/swig/build-android-x86_64.sh @@ -16,6 +16,7 @@ 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} +mkdir -p bin/release/${os_build}/${os_arch}/${SHARED_LIB} 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}" 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}"