Browse Source

switch target to 31, boost to 1.78.0

Signed-off-by: r4sas <r4sas@i2pmail.org>
pull/35/head
R4SAS 3 years ago
parent
commit
d6bfbc954d
Signed by: r4sas
GPG Key ID: 66F6C87B98EBCFE2
  1. 4
      app/build.gradle
  2. 6
      app/jni/build_boost.sh
  3. 1
      app/jni/build_miniupnpc.sh
  4. 9
      app/jni/build_openssl.sh

4
app/build.gradle

@ -8,11 +8,11 @@ dependencies {
} }
android { android {
compileSdkVersion 29 compileSdkVersion 31
defaultConfig { defaultConfig {
applicationId "org.purplei2p.i2pd" applicationId "org.purplei2p.i2pd"
targetSdkVersion 29 targetSdkVersion 31
minSdkVersion 16 minSdkVersion 16
versionCode 24000 versionCode 24000
versionName "2.40.0" versionName "2.40.0"

6
app/jni/build_boost.sh

@ -2,8 +2,8 @@
set -e set -e
BOOST_VERSION=1.74.0 BOOST_VERSION=1.78.0
BOOST_VERSION_SUFFIX=1_74 BOOST_VERSION_SUFFIX=1_78
BOOST_LIBS=date_time,filesystem,program_options,system BOOST_LIBS=date_time,filesystem,program_options,system
REMOVE_BOOST_LIBS_SUFFIX_x86_64=-clang-mt-x64-${BOOST_VERSION_SUFFIX} REMOVE_BOOST_LIBS_SUFFIX_x86_64=-clang-mt-x64-${BOOST_VERSION_SUFFIX}
@ -13,7 +13,7 @@ REMOVE_BOOST_LIBS_SUFFIX_ARM=-clang-mt-a32-${BOOST_VERSION_SUFFIX}
function build_one { function build_one {
echo "Configuring and building..." echo "Configuring and building..."
CXXFLAGS="-std=c++14" \ CXXFLAGS="-std=c++17" \
NCPU=$(nproc) \ NCPU=$(nproc) \
./build-android.sh \ ./build-android.sh \
--boost=${BOOST_VERSION} \ --boost=${BOOST_VERSION} \

1
app/jni/build_miniupnpc.sh

@ -2,7 +2,6 @@
set -e set -e
function build_one { function build_one {
mkdir -p out/${CPU} mkdir -p out/${CPU}
cd out/${CPU} cd out/${CPU}

9
app/jni/build_openssl.sh

@ -2,23 +2,18 @@
set -e set -e
function build_one { function build_one {
mkdir -p out/${CPU} mkdir -p out/${CPU}
echo "Configuring..." echo "Configuring OpenSSL for ${CPU}..."
./Configure \ ./Configure \
${TARGET} \ ${TARGET} \
no-shared \ no-shared \
no-ssl3 \
no-comp \
no-hw \
no-engine \
no-tests \ no-tests \
--prefix="$PWD/output" \ --prefix="$PWD/output" \
-D__ANDROID_API__=${API} -D__ANDROID_API__=${API}
echo "Building..." echo "Building OpenSSL for ${CPU}..."
make -j $(nproc) make -j $(nproc)
make install_sw make install_sw

Loading…
Cancel
Save