This commit is contained in:
Thomas 2021-02-05 09:59:31 +01:00
parent cd68de6274
commit d4270a3ef9
4 changed files with 5 additions and 11 deletions

View File

@ -14,11 +14,10 @@ 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/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/
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}"

View File

@ -14,10 +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${android_api}-clang
mkdir -p bin/release/${os_build}/${os_arch}-v8a/${SHARED_LIB}
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"
@ -52,6 +51,4 @@ else
cp swig/bin/release/${os_build}/${os_arch}-v8a/${SHARED_LIB} ../torrentStream/src/main/jnLibs/${os_arch}-v8a/
cd swig || exit
fi
fi
fi

View File

@ -14,9 +14,8 @@ 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}
mkdir -p bin/release/${os_build}/${os_arch}/${SHARED_LIB}
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}"

View File

@ -14,9 +14,8 @@ 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}
mkdir -p bin/release/${os_build}/${os_arch}/${SHARED_LIB}
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}"