Browse Source

2.46.1

Signed-off-by: R4SAS <r4sas@i2pmail.org>
pull/62/head 2.46.1
R4SAS 1 year ago
parent
commit
c7bdaac061
Signed by: r4sas
GPG Key ID: 66F6C87B98EBCFE2
  1. 11
      README.md
  2. 4
      app/build.gradle
  3. 4
      app/jni/build_boost.sh
  4. 6
      app/jni/build_miniupnpc.sh
  5. 2
      app/jni/i2pd
  6. 2
      app/jni/openssl
  7. 3
      fastlane/metadata/android/en-US/changelogs/2460100.txt

11
README.md

@ -35,7 +35,7 @@ cd /tmp/android-sdk @@ -35,7 +35,7 @@ cd /tmp/android-sdk
wget https://dl.google.com/android/repository/commandlinetools-linux-8092744_latest.zip
unzip commandlinetools-linux-8092744_latest.zip
# install required tools
./cmdline-tools/bin/sdkmanager --sdk_root=/opt/android-sdk "build-tools;31.0.0" "cmake;3.18.1" "ndk;21.4.7075529"
./cmdline-tools/bin/sdkmanager --sdk_root=/opt/android-sdk "build-tools;33.0.1" "cmake;3.22.1" "ndk;23.2.8568313"
```
### Clone repository with submodules
@ -47,8 +47,11 @@ git clone --recurse-submodules https://github.com/PurpleI2P/i2pd-android.git @@ -47,8 +47,11 @@ git clone --recurse-submodules https://github.com/PurpleI2P/i2pd-android.git
### Compile application
```bash
export ANDROID_SDK_ROOT=/opt/android-sdk
export ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/21.4.7075529
# if you are not using Java 11 by default:
export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
export ANDROID_HOME=/opt/android-sdk
export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313
pushd app/jni
./build_boost.sh
@ -69,7 +72,7 @@ Java 11 can be downloaded from [jdk.java.com](https://jdk.java.net/java-se-ri/11 @@ -69,7 +72,7 @@ Java 11 can be downloaded from [jdk.java.com](https://jdk.java.net/java-se-ri/11
Download Android SDK command line tools for Windows, unpack and install it replacing `--sdk_root=` path.
`ANDROID_SDK_ROOT` variable must point to SDK using linux-way path, like `/c/dev/android-sdk` when SDK installed to `C:\dev\android-sdk`.
`ANDROID_HOME` variable must point to SDK using linux-way path, like `/c/dev/android-sdk` when SDK installed to `C:\dev\android-sdk`.
Gradle can be called with `./gradlew` command inside project root, or you can install it using `pacman` and call `gradle` like on linux.

4
app/build.gradle

@ -14,8 +14,8 @@ android { @@ -14,8 +14,8 @@ android {
applicationId "org.purplei2p.i2pd"
targetSdkVersion 33
minSdkVersion 16
versionCode 2460000
versionName "2.46.0"
versionCode 2460100
versionName "2.46.1"
archivesBaseName += "-$versionName"
ndkVersion "23.2.8568313"

4
app/jni/build_boost.sh

@ -70,8 +70,8 @@ checkPreRequisites @@ -70,8 +70,8 @@ checkPreRequisites
cd boost
# disable verbose output
sed -i -e 's/d+2/d+0/' build-android.sh
sed -i -e 's/\"23\.1\"\|\"25\.0\"/\"23\.1\"\|\"23\.2\"\|\"25\.0\"/' build-android.sh
sed -i -E -e 's/d\+2/d\+0/' build-android.sh
sed -i -E -e 's/\"23\.1\"\|\"25\.0\"/\"23\.1\"\|\"23\.2\"\|\"25\.0\"/' build-android.sh
if (( $# == 0 )); then
build all

6
app/jni/build_miniupnpc.sh

@ -37,8 +37,8 @@ function checkPreRequisites { @@ -37,8 +37,8 @@ function checkPreRequisites {
exit
fi
if [ -z "$ANDROID_SDK_ROOT" -a "$ANDROID_SDK_ROOT" == "" ]; then
echo -e "\033[31mFailed! ANDROID_SDK_ROOT is empty. Run 'export ANDROID_SDK_ROOT=[PATH_TO_NDK]'\033[0m"
if [ -z "$ANDROID_HOME" -a "$ANDROID_HOME" == "" ]; then
echo -e "\033[31mFailed! ANDROID_HOME is empty. Run 'export ANDROID_HOME=[PATH_TO_NDK]'\033[0m"
exit
fi
@ -83,7 +83,7 @@ cd miniupnp/miniupnpc @@ -83,7 +83,7 @@ cd miniupnp/miniupnpc
rm -rf build out
# add cmake from Android SDK to PATH
PATH=$ANDROID_SDK_ROOT/cmake/$CMAKE_VERSION/bin:$PATH
PATH=$ANDROID_HOME/cmake/$CMAKE_VERSION/bin:$PATH
if (( $# == 0 )); then
build x86_64 arm64 arm x86

2
app/jni/i2pd

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit 1da9e2e1c0d3b6e95f576f933509126e129cb1b1
Subproject commit ebee6c5f1353f71ce3d325f08c29d07783cdc44d

2
app/jni/openssl

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit 129058165d195e43a0ad10111b0c2e29bdf65980
Subproject commit 830bf8e1e4749ad65c51b6a1d0d769ae689404ba

3
fastlane/metadata/android/en-US/changelogs/2460100.txt

@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
* Updated codebase to 2.46.1
* Switch to OpenSSL 1.1.1t
* Update Boost building scripts
Loading…
Cancel
Save