v2.5.5-beta2

Author: anonvector

app/build.gradle.kts

@@ -14,8 +14,8 @@ plugins {
 }
 
 val minSdkVersion = 24
-val appVersionName = "2.5.3"
-val appVersionCode = 77
+val appVersionName = "2.5.5-beta2"
+val appVersionCode = 79
 val cargoProfile = (findProperty("CARGO_PROFILE") as String?) ?: run {
     val isRelease = gradle.startParameter.taskNames.any { it.contains("Release", ignoreCase = true) }
     if (isRelease) "release" else "debug"
@@ -361,6 +361,12 @@ cargo {
         // Pass config encryption key to Rust build.rs for obfuscation
         spec.environment("CONFIG_ENCRYPTION_KEY", configEncryptionKey)
 
+        // Remap the build-machine home directory out of Rust panic strings.
+        // CARGO_ENCODED_RUSTFLAGS is appended to rustflags in .cargo/config.toml
+        // so the link-arg flags there are preserved.
+        val homeDir = System.getProperty("user.home")
+        spec.environment("CARGO_ENCODED_RUSTFLAGS", "--remap-path-prefix=${homeDir}=~")
+
         val toolchainPrebuilt = android.ndkDirectory
             .resolve("toolchains/llvm/prebuilt")
             .listFiles()

app/scripts/build-openssl-android.sh

@@ -80,16 +80,25 @@ build_openssl() {
 
     make clean 2>/dev/null || true
 
+    # Use neutral --prefix/--openssldir/--libdir so the build-machine path is
+    # not baked into OPENSSLDIR/ENGINESDIR/MODULESDIR in the compiled binary.
+    # Install via DESTDIR then copy the needed headers and static libs to $OUTPUT.
     ./Configure "$TARGET" \
         -D__ANDROID_API__=$ANDROID_API \
-        --prefix="$OUTPUT" \
-        --openssldir="$OUTPUT" \
+        --prefix=/usr/local \
+        --openssldir=/etc/ssl \
+        --libdir=lib \
         no-shared \
         no-tests \
         no-ui-console
 
     make -j$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 4)
-    make install_sw
+    local DESTDIR_TMP="$OUTPUT/destdir"
+    make install_sw DESTDIR="$DESTDIR_TMP"
+    mkdir -p "$OUTPUT/lib" "$OUTPUT/include"
+    cp -rp "$DESTDIR_TMP/usr/local/include/." "$OUTPUT/include/"
+    find "$DESTDIR_TMP/usr/local/lib" -name "*.a" -exec cp {} "$OUTPUT/lib/" \;
+    rm -rf "$DESTDIR_TMP"
 
     echo "OpenSSL for $ABI installed to $OUTPUT"
 }