diff --git a/frostwire-jlibtorrent/swig/build-android-arm.sh b/frostwire-jlibtorrent/swig/build-android-arm.sh index 2ade552..35200f6 100755 --- a/frostwire-jlibtorrent/swig/build-android-arm.sh +++ b/frostwire-jlibtorrent/swig/build-android-arm.sh @@ -17,7 +17,6 @@ prepare_android_toolchain abort_if_var_unset "ANDROID_TOOLCHAIN" ${ANDROID_TOOLCHAIN} 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 3950e61..cd2d513 100755 --- a/frostwire-jlibtorrent/swig/build-android-arm64.sh +++ b/frostwire-jlibtorrent/swig/build-android-arm64.sh @@ -16,7 +16,6 @@ export NDK_VERSION=r21d prepare_android_toolchain abort_if_var_unset "ANDROID_TOOLCHAIN" ${ANDROID_TOOLCHAIN} export CC=${ANDROID_TOOLCHAIN}/bin/aarch64-linux-android${android_api}-clang -mkdir -p bin/release/${os_build}/${os_arch}-v8a 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 0377ea8..e8c4035 100755 --- a/frostwire-jlibtorrent/swig/build-android-x86.sh +++ b/frostwire-jlibtorrent/swig/build-android-x86.sh @@ -15,7 +15,6 @@ export CXX=g++ export NDK_VERSION=r21d prepare_android_toolchain abort_if_var_unset "ANDROID_TOOLCHAIN" ${ANDROID_TOOLCHAIN} -mkdir -p bin/release/${os_build}/${os_arch} 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 6dfaa91..7767c56 100755 --- a/frostwire-jlibtorrent/swig/build-android-x86_64.sh +++ b/frostwire-jlibtorrent/swig/build-android-x86_64.sh @@ -15,7 +15,6 @@ export CXX=g++ export NDK_VERSION=r21d prepare_android_toolchain abort_if_var_unset "ANDROID_TOOLCHAIN" ${ANDROID_TOOLCHAIN} -mkdir -p bin/release/${os_build}/${os_arch} 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}" diff --git a/frostwire-jlibtorrent/swig/build-utils.shinc b/frostwire-jlibtorrent/swig/build-utils.shinc index 52c458d..5fbbdb1 100644 --- a/frostwire-jlibtorrent/swig/build-utils.shinc +++ b/frostwire-jlibtorrent/swig/build-utils.shinc @@ -231,6 +231,7 @@ build_libraries() { export LIBTORRENT_ROOT=${LIBTORRENT_ROOT} export BOOST_ROOT=${BOOST_ROOT} export BOOST_BUILD_PATH=${BOOST_ROOT} + make clean $run_bjam $run_objcopy $run_strip