wownero
/
wownerujo
Archived
4
0
Fork 0

some sdk updates on external libs

openssl-1.1.0
fuwa 6 years ago
parent 33444d0210
commit 70c207cf0b

@ -5,7 +5,10 @@ android {
buildToolsVersion '28.0.2' buildToolsVersion '28.0.2'
defaultConfig { defaultConfig {
applicationId 'com.wownero.wownerujo' applicationId 'com.wownero.wownerujo'
minSdkVersion 22
// No more security updates for Android 5 (sdk 21 and 22), so not supported.
// https://source.android.com/security/bulletin/2018-03-01
minSdkVersion 23
targetSdkVersion 28 targetSdkVersion 28
versionCode 1080 versionCode 1080
versionName '1.6.4.0' versionName '1.6.4.0'

@ -15,7 +15,7 @@
# try to pick it up with the value of _ANDROID_NDK_ROOT below. If # try to pick it up with the value of _ANDROID_NDK_ROOT below. If
# ANDROID_NDK_ROOT is set, then the value is ignored. # ANDROID_NDK_ROOT is set, then the value is ignored.
# _ANDROID_NDK="android-ndk-r8e" # _ANDROID_NDK="android-ndk-r8e"
_ANDROID_NDK="android-ndk-r10d" _ANDROID_NDK="android-ndk-r17b"
# _ANDROID_NDK="android-ndk-r10" # _ANDROID_NDK="android-ndk-r10"
# Set _ANDROID_EABI to the EABI you want to use. You can find the # Set _ANDROID_EABI to the EABI you want to use. You can find the
@ -37,7 +37,8 @@ _ANDROID_NDK="android-ndk-r10d"
# This value is always used. # This value is always used.
# _ANDROID_API="android-14" # _ANDROID_API="android-14"
#_ANDROID_API="android-18" #_ANDROID_API="android-18"
_ANDROID_API="android-21" # _ANDROID_API="android-21"
_ANDROID_API="android-23"
##################################################################### #####################################################################

@ -17,23 +17,27 @@ args="--build-type=minimal link=static runtime-link=static --with-chrono \
--with-date_time --with-filesystem --with-program_options --with-regex \ --with-date_time --with-filesystem --with-program_options --with-regex \
--with-serialization --with-system --with-thread \ --with-serialization --with-system --with-thread \
--includedir=$build_root/build/boost/include \ --includedir=$build_root/build/boost/include \
--toolset=clang threading=multi threadapi=pthread target-os=android \ --toolset=clang-android threading=multi threadapi=pthread target-os=android"
install"
echo $args echo $args
PATH=$build_root/tool/arm/arm-linux-androideabi/bin:$build_root/tool/arm/bin:$PATH \ PATH=$build_root/tool/arm/arm-linux-androideabi/bin:$build_root/tool/arm/bin:$PATH \
./b2 --build-dir=android-arm --prefix=$build_root/build/boost/arm $args ./b2 --build-dir=android-arm --prefix=$build_root/build/boost/arm $args \
--arch=armeabi-v7a \
install
ln -sf ../include $build_root/build/boost/arm ln -sf ../include $build_root/build/boost/arm
PATH=$build_root/tool/arm64/aarch64-linux-androideabi/bin:$build_root/tool/arm64/bin:$PATH \ PATH=$build_root/tool/arm64/aarch64-linux-androideabi/bin:$build_root/tool/arm64/bin:$PATH \
./b2 --build-dir=android-arm64 --prefix=$build_root/build/boost/arm64 $args ./b2 --build-dir=android-arm64 --prefix=$build_root/build/boost/arm64 $args \
install
ln -sf ../include $build_root/build/boost/arm64 ln -sf ../include $build_root/build/boost/arm64
PATH=$build_root/tool/x86/i686-linux-android/bin:$build_root/tool/x86/bin:$PATH \ PATH=$build_root/tool/x86/i686-linux-android/bin:$build_root/tool/x86/bin:$PATH \
./b2 --build-dir=android-x86--prefix=$build_root/build/boost/x86 $args ./b2 --build-dir=android-x86--prefix=$build_root/build/boost/x86 $args \
install
ln -sf ../include $build_root/build/boost/x86 ln -sf ../include $build_root/build/boost/x86
PATH=$build_root/tool/x86_64/x86_64-linux-android/bin:$build_root/tool/x86_64/bin:$PATH \ PATH=$build_root/tool/x86_64/x86_64-linux-android/bin:$build_root/tool/x86_64/bin:$PATH \
./b2 --build-dir=android-x86_64 --prefix=$build_root/build/boost/x86_64 $args ./b2 --build-dir=android-x86_64 --prefix=$build_root/build/boost/x86_64 $args \
install
ln -sf ../include $build_root/build/boost/x86_64 ln -sf ../include $build_root/build/boost/x86_64

@ -5,25 +5,16 @@ set -e
source script/build-external-libs/env.sh source script/build-external-libs/env.sh
build_root=$EXTERNAL_LIBS_BUILD_ROOT build_root=$EXTERNAL_LIBS_BUILD_ROOT
PATH=$ANDROID_NDK_ROOT/build/tools/:$PATH PATH=$ANDROID_NDK_ROOT/build/tools/:$PATH
if [ ! -d "$build_root/tool/arm" ]; then args="--api 23 --stl=libc++"
echo "installing arm" archs=(arm arm64 x86 x86_64)
make_standalone_toolchain.py --api 21 --stl=libc++ --arch arm --install-dir $build_root/tool/arm
fi
if [ ! -d "$build_root/tool/arm64" ]; then for arch in ${archs[@]}; do
echo "installing arm64"
make_standalone_toolchain.py --api 21 --stl=libc++ --arch arm64 --install-dir $build_root/tool/arm64
fi
if [ ! -d "$build_root/tool/x86" ]; then if [ ! -d "$build_root/tool/$arch" ]; then
echo "installing x86" echo "installing $arch"
make_standalone_toolchain.py --api 21 --stl=libc++ --arch x86 --install-dir $build_root/tool/x86 make_standalone_toolchain.py $args --arch $arch --install-dir $build_root/tool/$arch
fi fi
if [ ! -d "$build_root/tool/x86_64" ]; then done
echo "installing x86_64"
make_standalone_toolchain.py --api 21 --stl=libc++ --arch x86_64 --install-dir $build_root/tool/x86_64
fi