chore: consolidate fdroid with existing scripts

siddarthkay · siddarthkay · commit 9f9f6445af4a · 2026-02-14T22:06:09.000+05:30
- attempt to reuse a bunch of scripts
diff --git a/fdroid/build-app.sh b/fdroid/build-app.sh
@@ -1,24 +1,20 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 cd "$BUILD_DIR"
 
-export QT_HOST_PATH=$HOME/qt/6.9.2/gcc_64
-export QTDIR=$HOME/qt/6.9.2/android_arm64_v8a
-export QT_ANDROID_PATH=$HOME/qt/6.9.2/android_arm64_v8a
-export QMAKE=$HOME/qt/6.9.2/android_arm64_v8a/bin/qmake
-export PATH="$HOME/qt/6.9.2/gcc_64/bin:$HOME/qt/6.9.2/android_arm64_v8a/bin:$PATH"
-export CMAKE_PREFIX_PATH=$HOME/qt/6.9.2/android_arm64_v8a
-export Qt6_DIR=$HOME/qt/6.9.2/android_arm64_v8a/lib/cmake/Qt6
-export QT_PLUGIN_PATH=$HOME/qt/6.9.2/gcc_64/plugins
-export PKG_CONFIG_PATH=$HOME/qt/6.9.2/android_arm64_v8a/lib/pkgconfig
-export QT_ANDROID_DIR=$HOME/qt/6.9.2/android_arm64_v8a/src/android/java
+# shellcheck source=../scripts/setup-qt-env.sh
+source ./scripts/setup-qt-env.sh
+# shellcheck source=../scripts/setup-android-env.sh
+source ./scripts/setup-android-env.sh
+
 export GOPATH=$HOME/go
 export PATH="$GOPATH/bin:$PATH"
 go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
 
 ulimit -n 65536 || true
 export USE_SYSTEM_NIM=1
+export NIM_SDS_SOURCE_DIR="$BUILD_DIR/vendor/nim-sds"
 
 make deps
 
diff --git a/fdroid/build-openssl.sh b/fdroid/build-openssl.sh
@@ -1,9 +1,21 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# Build OpenSSL for Qt Android build
+# This builds OpenSSL as a dependency for Qt compilation
+# (separate from mobile/scripts/buildOpenSSL.sh which builds for the app)
+#
 set -e
 
 cd "$OPENSSL_SRCDIR"
 
-export PATH="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH"
+# Use shared Android NDK setup if available, otherwise set PATH directly
+if [[ -f "$BUILD_DIR/scripts/setup-android-env.sh" ]]; then
+    # shellcheck source=../scripts/setup-android-env.sh
+    source "$BUILD_DIR/scripts/setup-android-env.sh"
+else
+    # Fallback for when running in isolation
+    export PATH="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH"
+fi
 
 ./Configure android-arm64 -D__ANDROID_API__=24 \
     --prefix="$HOME/openssl" \
diff --git a/fdroid/build-qt-android.sh b/fdroid/build-qt-android.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 mkdir -p build_qt_android && cd build_qt_android
diff --git a/fdroid/build-qt-host.sh b/fdroid/build-qt-host.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 mkdir -p "$HOME/qt_build_tmp"
diff --git a/fdroid/cleanup-binaries.sh b/fdroid/cleanup-binaries.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # Remove binary files that F-Droid scanner would flag
@@ -16,6 +16,6 @@ find mobile/vendors/openssl/cloudflare-quiche -name "Cargo.toml" -type f -delete
 find vendor/QR-Code-generator/rust -name "Cargo.toml" -type f -delete
 find test/e2e -type f -delete
 find vendor/nimPNG/tests/invalidInput -type f -delete
-find vendor/qzxing/tests -name "*.bin" -type f -delete
-find vendor/status-go/messaging/layers/segmentation/testdata -name "*.bin" -type f -delete
 find vendor/nim-bearssl/bearssl/csources -name "*.exe" -type f -delete
+find vendor/status-go/pkg/messaging/layers/segmentation/testdata -name "*.bin" -type f -delete
+rm -f test/e2e_appium/package.json
diff --git a/fdroid/metadata.yml b/fdroid/metadata.yml
@@ -1,14 +1,15 @@
 AntiFeatures:
   NonFreeNet:
-    en-US: Relies on centralized services like Infura for blockchain interactions,
-      making it dependent on non-libre infrastructure.
+    en-US: Relies on centralized services like Infura for blockchain
+      interactions, making it dependent on non-libre infrastructure.
   TetheredNet:
-    en-US: Messaging and user profiles are stored on Waku servers rather than being
-      fully peer-to-peer, requiring a connection to a specific service instance.
+    en-US: Messaging and user profiles are stored on Waku servers rather than
+      being fully peer-to-peer, requiring a connection to a specific service
+      instance.
   Tracking:
-    en-US: Collects and processes IP addresses, wallet addresses, and transaction
-      details via the API Proxy Server. Data is shared with third-party services like
-      Infura, Grove, and Cryptocompare.
+    en-US: Collects and processes IP addresses, wallet addresses, and
+      transaction details via the API Proxy Server. Data is shared with
+      third-party services like Infura, Grove, and Cryptocompare.
 Categories:
   - Connectivity
   - Messaging
@@ -29,18 +30,15 @@ RepoType: git
 Repo: https://github.com/status-im/status-app.git
 
 Builds:
-  - versionName: 2.36.1
-    versionCode: 29498842
-    commit: 47482570fcdedc23f18ddbac2062fbc1e901ee6d
+  - versionName: 2.37.0
+    versionCode: 29500000
+    commit: 0391438ad983f828b7f75dc3ff690f8648232c75
     timeout: 86400
     submodules: true
     sudo:
       - metadata/app.status.mobile/setup-dependencies.sh
-    patch:
-      - fdroid-build-gradle.patch
-      - add-fdroid-apk-detection.patch
-      - add-fdroid-make-target.patch
-    output: mobile/build/android/qt6/android-build/build/outputs/apk/fdroid/android-build-fdroid-unsigned.apk
+    output:
+      mobile/build/android/qt6/android-build/build/outputs/apk/fdroid/android-build-fdroid-unsigned.apk
     srclibs:
       - Qt@v6.9.2
       - OpenSSL@openssl-3.0.15
@@ -51,12 +49,10 @@ Builds:
       - ./cleanup-binaries.sh
       - cd $$Nim$$ && sh build_all.sh
       - cd $$Qt$$
-      - perl init-repository --module-subset=qtbase,qtdeclarative,qt5compat,qtmultimedia,qtshadertools,qtimageformats,qtwebview,qtscxml,qtsvg
-    scanignore:
-      - vendor/status-go/vendor/golang.org/x/net/publicsuffix/data/
-      - vendor/status-go/vendor/github.com/libp2p/go-libp2p-asn-util/sorted-network-list.bin
+      - perl init-repository
+        --module-subset=qtbase,qtdeclarative,qt5compat,qtmultimedia,qtshadertools,qtimageformats,qtwebview,qtscxml,qtsvg
     build:
-      - export FDROID_VERSION_CODE=29498842
+      - export FDROID_VERSION_CODE=29500000
       - export JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
       - export ANDROID_SDK_ROOT=/opt/android-sdk
       - export ANDROID_HOME=/opt/android-sdk
@@ -91,5 +87,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2.36.1
-CurrentVersionCode: 29498842
+CurrentVersion: 2.37.0
+CurrentVersionCode: 29500000
diff --git a/fdroid/setup-dependencies.sh b/fdroid/setup-dependencies.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 apt-get update
diff --git a/mobile/scripts/Common.mk b/mobile/scripts/Common.mk
@@ -67,7 +67,7 @@ WRAPPER_APP_FILES := $(shell find $(WRAPPER_APP) -type f)
 STATUS_Q_SCRIPT := $(SCRIPTS_PATH)/buildStatusQ.sh
 STATUS_GO_SCRIPT := $(SCRIPTS_PATH)/buildStatusGo.sh
 DOTHERSIDE_SCRIPT := $(SCRIPTS_PATH)/buildDOtherSide.sh
-OPENSSL_SCRIPT := $(SCRIPTS_PATH)/ios/buildOpenSSL.sh
+OPENSSL_SCRIPT := $(SCRIPTS_PATH)/buildOpenSSL.sh
 QRCODEGEN_SCRIPT := $(SCRIPTS_PATH)/buildQRCodeGen.sh
 STATUS_KEYCARD_QT_SCRIPT := $(SCRIPTS_PATH)/buildStatusKeycardQt.sh
 NIM_STATUS_CLIENT_SCRIPT := $(SCRIPTS_PATH)/buildNimStatusClient.sh
diff --git a/mobile/scripts/buildOpenSSL.sh b/mobile/scripts/buildOpenSSL.sh
@@ -17,7 +17,8 @@ SSL_BUILD_DIR=${BUILD_DIR}/openssl-${TARGET}
 CRYPTO_OUTPUT_LIB=${LIB_PATH}/libcrypto_3${LIB_EXT}
 SSL_OUTPUT_LIB=${LIB_PATH}/libssl_3${LIB_EXT}
 
-PLATFORM_ARGS=""
+PLATFORM_CONFIG_ARGS=()
+PLATFORM_BUILD_ARGS=()
 
 if [[ "$OS" == "ios" ]]; then
   if [[ "$SDK" == "iphonesimulator" ]]; then
@@ -38,30 +39,30 @@ if [[ "$OS" == "ios" ]]; then
 fi
 
 if [[ "$OS" == "android" ]]; then
-  PLATFORM_CONFIG_ARGS="-U__ANDROID_API__ -D__ANDROID_API__=${ANDROID_API}"
-  PLATFORM_BUILD_ARGS="SHLIB_VERSION_NUMBER="
+  PLATFORM_CONFIG_ARGS=("-U__ANDROID_API__" "-D__ANDROID_API__=${ANDROID_API}")
+  PLATFORM_BUILD_ARGS=("SHLIB_VERSION_NUMBER=")
   cleanup() {
     if [[ "$OS" == "android" ]]; then
-      patch -d ${OPENSSL} -R -p0 <"${SCRIPT_DIR}/openssl-patch.diff"
+      patch -d "${OPENSSL}" -R -p0 <"${SCRIPT_DIR}/openssl-patch.diff"
     fi
   }
 
   trap cleanup EXIT
-  patch -d ${OPENSSL} -p0 <"${SCRIPT_DIR}/openssl-patch.diff"
+  patch -d "${OPENSSL}" -p0 <"${SCRIPT_DIR}/openssl-patch.diff"
 fi
 
-echo "Building OpenSSL for $TARGET with platform config args $PLATFORM_CONFIG_ARGS"
+echo "Building OpenSSL for $TARGET with platform config args ${PLATFORM_CONFIG_ARGS[*]}"
 
-mkdir -p ${SSL_BUILD_DIR}
+mkdir -p "${SSL_BUILD_DIR}"
 
 (
-  cd ${SSL_BUILD_DIR}
-  
+  cd "${SSL_BUILD_DIR}"
+
   # - no-module: Makes legacy provider built-in to libcrypto (not a separate module)
   # - enable-legacy: Enables legacy algorithms including DES
   # This is required for GlobalPlatform SCP02 which uses single-DES
   # Reference: https://github.com/openssl/openssl/discussions/25793
-  
+
   # Platform-specific config
   if [[ "$OS" == "ios" ]]; then
     # iOS uses static libraries (.a files)
@@ -70,19 +71,19 @@ mkdir -p ${SSL_BUILD_DIR}
     # Android uses shared libraries (.so files)
     SHARED_FLAG="shared"
   fi
-  
-  ${OPENSSL}/Configure --release "$TARGET" $PLATFORM_CONFIG_ARGS \
+
+  "${OPENSSL}"/Configure --release "$TARGET" "${PLATFORM_CONFIG_ARGS[@]}" \
     no-module \
     enable-legacy \
     enable-des \
     enable-md2 \
     enable-rc5 \
-    $SHARED_FLAG \
+    "$SHARED_FLAG" \
     no-tests \
     no-ui-console
   # Rebuilding isn't working with the default target, so we need to clean and build again
   make clean
-  make -j$(sysctl -n hw.ncpu) $PLATFORM_BUILD_ARGS build_libs
+  make -j"$(sysctl -n hw.ncpu)" "${PLATFORM_BUILD_ARGS[@]}" build_libs
 )
 
 mkdir -p "$LIB_PATH"
diff --git a/mobile/scripts/openssl-patch.diff b/mobile/scripts/openssl-patch.diff
diff --git a/scripts/fdroid-local-build.sh b/scripts/fdroid-local-build.sh
@@ -5,8 +5,8 @@
 #
 # Usage:
 #   ./fdroid-local-build.sh [appid:versioncode]
-#   ./fdroid-local-build.sh                              # defaults to app.status.mobile:29498842
-#   ./fdroid-local-build.sh app.status.mobile:29498842   # explicit app:version
+#   ./fdroid-local-build.sh                              # defaults to app.status.mobile:29500000
+#   ./fdroid-local-build.sh app.status.mobile:29500000   # explicit app:version
 #   ./fdroid-local-build.sh --shell                      # enter interactive shell for debugging
 #
 # Requirements:
@@ -21,7 +21,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 # Configuration
 DOCKER_IMAGE="registry.gitlab.com/fdroid/fdroidserver:buildserver-trixie"
 FDROIDDATA_PATH="${FDROIDDATA_PATH:-$SCRIPT_DIR/fdroiddata}"
-DEFAULT_BUILD="app.status.mobile:29498842"
+DEFAULT_BUILD="app.status.mobile:29500000"
 CONTAINER_NAME="fdroid-local-build-$$"
 ENTRYPOINT_SCRIPT="$SCRIPT_DIR/fdroid-container-build.sh"
 
@@ -62,10 +62,10 @@ OPTIONS:
     -h, --help      Show this help message
 
 EXAMPLES:
-    $0                                    # Build default (app.status.mobile:29498842)
-    $0 app.status.mobile:29498842         # Build specific version
+    $0                                    # Build default (app.status.mobile:29500000)
+    $0 app.status.mobile:29500000         # Build specific version
     $0 --shell                            # Interactive shell for debugging
-    $0 --pull app.status.mobile:29498842  # Force pull image before build
+    $0 --pull app.status.mobile:29500000  # Force pull image before build
 
 ENVIRONMENT VARIABLES:
     FDROIDDATA_PATH    Path to fdroiddata repo (default: ./fdroiddata)
diff --git a/scripts/setup-android-env.sh b/scripts/setup-android-env.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+#
+# Shared Android NDK environment setup
+# Used by both F-Droid and regular Android CI builds
+#
+# Usage: source scripts/setup-android-env.sh
+#
+# Required environment variables:
+#   ANDROID_NDK_ROOT - Path to Android NDK
+#
+# Optional environment variables:
+#   ANDROID_SDK_ROOT - Path to Android SDK
+#   ANDROID_API      - Android API level (default: 28)
+#   ARCH             - Target architecture (default: arm64)
+#
+
+if [[ -z "$ANDROID_NDK_ROOT" ]]; then
+    echo "Error: ANDROID_NDK_ROOT is not set" >&2
+    # shellcheck disable=SC2317
+    return 1 2>/dev/null || exit 1
+fi
+
+if [[ ! -d "$ANDROID_NDK_ROOT" ]]; then
+    echo "Error: ANDROID_NDK_ROOT does not exist: $ANDROID_NDK_ROOT" >&2
+    # shellcheck disable=SC2317
+    return 1 2>/dev/null || exit 1
+fi
+
+ANDROID_API="${ANDROID_API:-28}"
+ARCH="${ARCH:-arm64}"
+HOST_OS="$(uname -s | tr '[:upper:]' '[:lower:]')"
+
+# NDK toolchain paths
+NDK_TOOLCHAIN="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/${HOST_OS}-x86_64"
+
+export AR="$NDK_TOOLCHAIN/bin/llvm-ar"
+export AS="$NDK_TOOLCHAIN/bin/llvm-as"
+export RANLIB="$NDK_TOOLCHAIN/bin/llvm-ranlib"
+export STRIP="$NDK_TOOLCHAIN/bin/llvm-strip"
+
+# Add NDK toolchain to PATH
+export PATH="$NDK_TOOLCHAIN/bin:$PATH"
+
+# Set Android ABI based on architecture
+case "$ARCH" in
+    arm64)
+        export ANDROID_ABI="arm64-v8a"
+        ;;
+    arm)
+        export ANDROID_ABI="armeabi-v7a"
+        ;;
+    x86_64|amd64)
+        export ANDROID_ABI="x86_64"
+        ;;
+    x86|386)
+        export ANDROID_ABI="x86"
+        ;;
+    *)
+        export ANDROID_ABI="$ARCH"
+        ;;
+esac
+
+export ANDROID_API
+export HOST_OS
+
+echo "Android NDK environment configured: $ANDROID_NDK_ROOT (API $ANDROID_API, ABI $ANDROID_ABI)"
diff --git a/scripts/setup-qt-env.sh b/scripts/setup-qt-env.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+#
+# Shared Qt environment setup for Android builds
+# Used by both F-Droid and regular Android CI builds
+#
+# Usage: source scripts/setup-qt-env.sh
+#
+
+QT_VERSION="${QT_VERSION:-6.9.2}"
+
+# Detect Qt installation location
+if [[ -d "/opt/qt/$QT_VERSION" ]]; then
+    # Jenkins CI: Qt pre-installed in Docker image
+    QT_BASE="/opt/qt/$QT_VERSION"
+elif [[ -d "$HOME/qt/$QT_VERSION" ]]; then
+    # F-Droid: Qt built from source
+    QT_BASE="$HOME/qt/$QT_VERSION"
+elif [[ -n "$QT_PATH" && -d "$QT_PATH" ]]; then
+    # Custom path via environment variable
+    QT_BASE="$QT_PATH"
+else
+    echo "Error: Qt $QT_VERSION not found in /opt/qt, \$HOME/qt, or \$QT_PATH" >&2
+    # shellcheck disable=SC2317
+    return 1 2>/dev/null || exit 1
+fi
+
+export QT_HOST_PATH="$QT_BASE/gcc_64"
+export QTDIR="$QT_BASE/android_arm64_v8a"
+export QT_ANDROID_PATH="$QT_BASE/android_arm64_v8a"
+export QMAKE="$QT_BASE/android_arm64_v8a/bin/qmake"
+export CMAKE_PREFIX_PATH="$QT_BASE/android_arm64_v8a"
+export Qt6_DIR="$QT_BASE/android_arm64_v8a/lib/cmake/Qt6"
+export QT_PLUGIN_PATH="$QT_BASE/gcc_64/plugins"
+export PKG_CONFIG_PATH="$QT_BASE/android_arm64_v8a/lib/pkgconfig"
+export QT_ANDROID_DIR="$QT_BASE/android_arm64_v8a/src/android/java"
+
+# Add Qt binaries to PATH
+export PATH="$QT_BASE/gcc_64/bin:$QT_BASE/android_arm64_v8a/bin:$PATH"
+
+echo "Qt environment configured: $QT_BASE"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/bash`
	`1`	`+#!/usr/bin/env bash`
`2`	`2`	`set -e`
`3`	`3`
`4`	`4`	`mkdir -p build_qt_android && cd build_qt_android`