Update jlibjbigis

eyedeekay · eyedeekay · commit 2311c24aef9c · 2026-02-23T19:42:01.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,33 @@ signing.properties
 .gradle/
 local.properties
 override.properties
+
+# VS Code
+.vscode/
+
+# Build outputs
+app/build/
+app/free/
+lib/client/build/
+lib/helper/build/
+routerjars/build/
+routerjars/libs/
+
+# Generated resources (created by copyI2PResources / copyI2PAssets tasks)
+app/src/main/res/drawable/i2plogo.png
+app/src/main/res/raw/
+app/src/main/assets/
+
+# Release artifacts
+*.apk
+*.aab
+*.asc
+*.sig
+
+# Patch files
+*.patch
+helpdiff
+
+# Redundant per-module gradle.properties (covered by root)
+app/gradle.properties
 build
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,6 +8,7 @@ repositories {
 
 android {
     namespace 'net.i2p.android.router'
+    ndkVersion '28.2.13676358'
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
     buildFeatures {
         viewBinding true
@@ -17,6 +18,9 @@ android {
         versionName "$I2P_ANDROID_VERSION"
         minSdkVersion 21
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
+        ndk {
+            abiFilters 'armeabi-v7a', 'arm64-v8a'
+        }
 
         // For Espresso
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
     <application
         android:icon="@drawable/ic_launcher_itoopie"
         android:label="@string/app_name"
+        android:extractNativeLibs="false"
         android:theme="@style/Theme.I2P">
         <service
             android:name=".service.RouterService"
diff --git a/etc/docker.local.ndk.properties b/etc/docker.local.ndk.properties
@@ -1 +1 @@
-ndk.dir=/opt/android-sdk-linux/ndk/
+ndk.dir=/opt/android-sdk-linux/ndk/28.2.13676358
diff --git a/etc/github.gradle.properties b/etc/github.gradle.properties
@@ -14,8 +14,8 @@ POM_DEVELOPER_ID=github-ci
 POM_DEVELOPER_NAME=github-ci
 POM_DEVELOPER_EMAIL=hankhill19580@gmail.com
 
-ANDROID_BUILD_TARGET_SDK_VERSION=33
-ANDROID_BUILD_SDK_VERSION=33
+ANDROID_BUILD_TARGET_SDK_VERSION=35
+ANDROID_BUILD_SDK_VERSION=35
 
 I2P_VERSION=2.4.0
 I2P_ANDROID_VERSION=2.4.0
diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@ ANDROID_BUILD_SDK_VERSION=35
 ANDROID_BUILD_TARGET_SDK_VERSION=35
 GROUP=net.i2p.android
 I2P_ANDROID_VERSION=2.11.0
-I2P_ANDROID_VERSION_CODE=4745298
+I2P_ANDROID_VERSION_CODE=4745303
 I2P_VERSION=2.11.0-1
 POM_DEVELOPER_EMAIL=hankhill19580@gmail.com
 POM_DEVELOPER_ID=idk
diff --git a/lib/client/build.gradle b/lib/client/build.gradle
@@ -7,6 +7,7 @@ repositories {
 }
 
 android {
+    ndkVersion '28.2.13676358'
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
     defaultConfig {
         minSdkVersion 21
diff --git a/lib/client/src/main/jniLibs/arm64-v8a/libjbigi.so b/lib/client/src/main/jniLibs/arm64-v8a/libjbigi.so
diff --git a/lib/client/src/main/jniLibs/armeabi-v7a/libjbigi.so b/lib/client/src/main/jniLibs/armeabi-v7a/libjbigi.so
diff --git a/lib/client/src/main/jniLibs/armeabi/libjbigi.so b/lib/client/src/main/jniLibs/armeabi/libjbigi.so
diff --git a/lib/client/src/main/jniLibs/build.sh b/lib/client/src/main/jniLibs/build.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 #
-# build GMP and libjbigi.so using the Android tools directly
+# build GMP and libjbigi.so using the Android NDK toolchain
 #
-# WARNING:
-# BROKEN - not updated for r19 NDK, aarch64, or GMP 6.1.2
-# Use the following in i2p.i2p source core/c/jbigi:
+# Updated for NDK r28+ with 16KB page alignment support
+# (required for Google Play Store compliance)
+#
+# Alternatively, use the following in i2p.i2p source core/c/jbigi:
 # TARGET=android BITS=32 mbuild_all.sh
 # TARGET=android BITS=64 mbuild_all.sh
 #
-# TODO: Get more settings from environment variables set in ../custom-rules.xml
-#
 
 # uncomment to skip
 # exit 0
@@ -34,7 +33,7 @@ if [ ! -d "$I2PBASE" ]; then
     exit 1
 fi
 
-ROUTERJARS=$THISDIR/../../../../routerjars
+ROUTERJARS=$THISDIR/../../../../../routerjars
 
 ## Check the local.properties file first
 export NDK=$(awk -F= '/ndk\.dir/{print $2}' "$ROUTERJARS/local.properties")
@@ -77,7 +76,7 @@ JBIGI="$I2PBASE/core/c/jbigi"
 # libcrypto crashes on emulator, don't trust it
 # jbigi about 20-25% slower than java on emulator
 #
-GMPVER=6.1.2
+GMPVER=6.2.1
 GMP="$JBIGI/gmp-$GMPVER"
 
 if [ ! -d "$GMP" ]; then
@@ -106,45 +105,41 @@ fi
 LEVEL=$(awk -F' ' '/minSdkVersion/{print $2}' ../../../build.gradle)
 
 #
-# 4.6 is the GCC version. GCC 4.4.3 support was removed in NDK r9b.
-# Available in r10:
-#	arm-linux-androideabi-4.6
-#	arm-linux-androideabi-4.8
-#	arm-linux-androideabi-clang3.3
-#	arm-linux-androideabi-clang3.4
-#	llvm-3.3
-#	llvm-3.4
-#	mipsel-linux-android-4.6
-#	mipsel-linux-android-4.8
-#	mipsel-linux-android-clang3.3
-#	mipsel-linux-android-clang3.4
-#	x86-4.6
-#	x86-4.8
-#	x86-clang3.3
-#	x86-clang3.4
-GCCVER=4.8
-
-for ABI in "armeabi" "armeabi-v7a" "x86" "mips"; do
+#
+# NDK r28+ uses the LLVM/Clang toolchain exclusively.
+# GCC was removed in NDK r18. Standalone toolchains were removed in NDK r19.
+# We now use the NDK's built-in clang directly.
+#
+# 16KB page alignment: All LOAD segments in .so files must be aligned to
+# at least 16KB (0x4000) for Google Play Store compliance.
+# This is achieved via: -Wl,-z,max-page-size=16384
+#
+
+TOOLCHAIN_DIR="$NDK/toolchains/llvm/prebuilt/linux-x86_64"
+if [ ! -d "$TOOLCHAIN_DIR" ]; then
+    # Try macOS path
+    TOOLCHAIN_DIR="$NDK/toolchains/llvm/prebuilt/darwin-x86_64"
+fi
+if [ ! -d "$TOOLCHAIN_DIR" ]; then
+    echo "Cannot find NDK toolchain in $NDK/toolchains/llvm/prebuilt/"
+    exit 1
+fi
+
+for ABI in "armeabi-v7a" "arm64-v8a"; do
 
 # ABI-specific settings
 case "$ABI" in
-    "armeabi" | "armeabi-v7a")
+    "armeabi-v7a")
         ARCH="arm"
-        TOOLCHAIN="arm-linux-androideabi-$GCCVER"
+        TARGET="armv7a-linux-androideabi"
         export BINPREFIX="arm-linux-androideabi-"
         CONFIGUREHOST="arm-linux-androideabi"
         ;;
-    "x86")
-        ARCH="x86"
-        TOOLCHAIN="x86-$GCCVER"
-        export BINPREFIX="i686-linux-android-"
-        CONFIGUREHOST="i686-linux-android"
-        ;;
-    "mips")
-        ARCH="mips"
-        TOOLCHAIN="mipsel-linux-android-$GCCVER"
-        export BINPREFIX="mipsel-linux-android-"
-        CONFIGUREHOST="mipsel-linux-android"
+    "arm64-v8a")
+        ARCH="aarch64"
+        TARGET="aarch64-linux-android"
+        export BINPREFIX="aarch64-linux-android-"
+        CONFIGUREHOST="aarch64-linux-android"
         ;;
 esac
 
@@ -161,71 +156,43 @@ then
     continue
 fi
 
-if [ `uname -s` = "Darwin" ]; then
-    export SYSTEM="darwin-x86"
-    BUILDHOST="x86-darwin"
-elif [ `uname -m` = "x86_64" ]; then
-    export SYSTEM="linux-x86_64"
+if [ `uname -m` = "x86_64" ]; then
     BUILDHOST="x86_64-pc-linux-gnu"
 else
-    export SYSTEM="linux-x86"
     BUILDHOST="x86-pc-linux-gnu"
 fi
-
-TOOLCHAINDIR="/tmp/android-$LEVEL-$ARCH-$GCCVER"
-if [ ! -d ${TOOLCHAINDIR} ]
-then
-    ${NDK}/build/tools/make-standalone-toolchain.sh --toolchain=${TOOLCHAIN} --platform=android-${LEVEL} --install-dir=${TOOLCHAINDIR} --system=${SYSTEM}
-fi
-
-export SYSROOT="$TOOLCHAINDIR/sysroot/"
-if [ ! -d "$SYSROOT" ]; then
-    echo "Cannot find $SYSROOT in NDK, check for support of level: $LEVEL arch: $ARCH or adjust LEVEL and ARCH in script"
-    exit 1
+if [ `uname -s` = "Darwin" ]; then
+    BUILDHOST="x86-darwin"
 fi
 
-COMPILER="$TOOLCHAINDIR/bin/${BINPREFIX}gcc"
+# NDK r19+ uses a unified toolchain - no standalone toolchain needed
+COMPILER="$TOOLCHAIN_DIR/bin/${TARGET}${LEVEL}-clang"
 if [ ! -f "$COMPILER" ]; then
-    echo "Cannot find compiler $COMPILER in NDK, check for support of system: $SYSTEM ABI: $AABI or adjust AABI and SYSTEM in script"
+    echo "Cannot find compiler $COMPILER"
+    echo "Check that NDK version supports API level $LEVEL for target $TARGET"
     exit 1
 fi
-export CC="$COMPILER --sysroot=$SYSROOT"
-# worked without this on 4.3.2, but 5.0.2 couldn't find it
-export NM="$TOOLCHAINDIR/bin/${BINPREFIX}nm"
-STRIP="$TOOLCHAINDIR/bin/${BINPREFIX}strip"
+export CC="$COMPILER"
+export NM="$TOOLCHAIN_DIR/bin/llvm-nm"
+STRIP="$TOOLCHAIN_DIR/bin/llvm-strip"
 
 export LIBGMP_LDFLAGS='-avoid-version'
 
+# Common 16KB page alignment flag - required for Google Play Store
+PAGE_SIZE_FLAGS='-Wl,-z,max-page-size=16384'
+
 case "$ARCH" in
     "arm")
-        BASE_CFLAGS='-O2 -g -pedantic -fomit-frame-pointer -Wa,--noexecstack -ffunction-sections -funwind-tables -fstack-protector -fno-strict-aliasing -finline-limit=64'
-        case "$ABI" in
-            "armeabi")
-                MPN_PATH="arm/v5 arm generic"
-                export CFLAGS="${BASE_CFLAGS} -march=armv5te -mtune=xscale -msoft-float -mthumb"
-                ;;
-            "armeabi-v7a")
-                MPN_PATH="arm/v6t2 arm/v6 arm/v5 arm generic"
-                export CFLAGS="${BASE_CFLAGS} -march=armv7-a -mfloat-abi=softfp -mfpu=vfp"
-                ;;
-        esac
-        export LDFLAGS='-Wl,--fix-cortex-a8 -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now'
-        ;;
-    "x86")
-        MPN_PATH="x86/atom/sse2 x86/atom/mmx x86/atom x86 generic"
-        # Base CFLAGS set from ndk-build output
-        BASE_CFLAGS='-O2 -g -pedantic -Wa,--noexecstack -fomit-frame-pointer -ffunction-sections -funwind-tables -fstrict-aliasing -funswitch-loops -finline-limit=300'
-        # x86, CFLAGS set according to 'CPU Arch ABIs' in the r8c documentation
-        export CFLAGS="${BASE_CFLAGS} -march=i686 -mtune=atom -msse3 -mstackrealign -mfpmath=sse -m32"
-        export LDFLAGS='-Wl,-z,noexecstack,-z,relro'
+        MPN_PATH="arm/v6t2 arm/v6 arm/v5 arm generic"
+        BASE_CFLAGS='-O2 -g -pedantic -fomit-frame-pointer -ffunction-sections -funwind-tables -fstack-protector -fno-strict-aliasing'
+        export CFLAGS="${BASE_CFLAGS} -march=armv7-a -mfloat-abi=softfp -mfpu=vfp"
+        export LDFLAGS="-Wl,--fix-cortex-a8 -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now ${PAGE_SIZE_FLAGS}"
         ;;
-    "mips")
-        MPN_PATH=""
-        # Base CFLAGS set from ndk-build output
-        BASE_CFLAGS='-O2 -g -pedantic -fomit-frame-pointer -Wa,--noexecstack -fno-strict-aliasing -finline-functions -ffunction-sections -funwind-tables -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers -funswitch-loops -finline-limit=300'
-        # mips CFLAGS not specified in 'CPU Arch ABIs' in the r8b documentation
+    "aarch64")
+        MPN_PATH="arm64 generic"
+        BASE_CFLAGS='-O2 -g -pedantic -fomit-frame-pointer -ffunction-sections -funwind-tables -fstack-protector -fno-strict-aliasing'
         export CFLAGS="${BASE_CFLAGS}"
-        export LDFLAGS='-Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now'
+        export LDFLAGS="-Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now ${PAGE_SIZE_FLAGS}"
         ;;
 esac
 
diff --git a/lib/helper/build.gradle b/lib/helper/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.android.library'
 version = '0.9.5'
 
 android {
+    ndkVersion '28.2.13676358'
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
     defaultConfig {
         minSdkVersion 21

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ndk.dir=/opt/android-sdk-linux/ndk/`
	`1`	`+ndk.dir=/opt/android-sdk-linux/ndk/28.2.13676358`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ repositories {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`android {`
	`10`	`+ ndkVersion '28.2.13676358'`
`10`	`11`	`compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)`
`11`	`12`	`defaultConfig {`
`12`	`13`	`minSdkVersion 21`