From 8bac076344f39061aaae08ed70efea8b7cc03714 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Wed, 27 Aug 2025 16:41:36 +0200 Subject: [PATCH 01/29] update status-go to adopt sds --- vendor/status-go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/status-go b/vendor/status-go index 2c69b915ca3..0f399b12a52 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 2c69b915ca3ee411c204f1cf6b12619c7b11475e +Subproject commit 0f399b12a52a834cb5e30813ad1d3e11c9132d97 From d7f7875166d630c78658e3eeba14ee018e166657 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Wed, 27 Aug 2025 18:18:03 +0200 Subject: [PATCH 02/29] Common.mk: remove duplicated line --- mobile/scripts/Common.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/mobile/scripts/Common.mk b/mobile/scripts/Common.mk index c274e652407..e13500b57ac 100644 --- a/mobile/scripts/Common.mk +++ b/mobile/scripts/Common.mk @@ -47,7 +47,6 @@ STATUS_DESKTOP_UI_FILES := $(shell find $(STATUS_DESKTOP)/ui -type f \( -iname ' STATUS_Q_FILES := $(shell find $(STATUSQ) -type f \( -iname '*.cpp' -o -iname '*.h' \) -not -iname '*.qrc' -not -iname '*.qml') STATUS_Q_UI_FILES := $(shell find $(STATUSQ) -type f \( -iname '*.qml' -o -iname '*.qrc' \)) STATUS_GO_FILES := $(shell find $(STATUS_GO) -type f \( -iname '*.go' \)) -STATUS_GO_SCRIPT := $(SCRIPTS_PATH)/buildStatusGo.sh DOTHERSIDE_FILES := $(shell find $(DOTHERSIDE) -type f \( -iname '*.cpp' -o -iname '*.h' \)) OPENSSL_FILES := $(shell find $(OPENSSL) -type f \( -iname '*.c' -o -iname '*.h' \)) QRCODEGEN_FILES := $(shell find $(QRCODEGEN) -type f \( -iname '*.c' -o -iname '*.h' \)) From f95e2bb5700df36df1834b6640dd5daf35aa360d Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Wed, 27 Aug 2025 18:18:27 +0200 Subject: [PATCH 03/29] buildStatusGo.sh: prepare sds for status-go --- mobile/scripts/buildStatusGo.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mobile/scripts/buildStatusGo.sh b/mobile/scripts/buildStatusGo.sh index 1157c2943aa..305bcf80ae5 100755 --- a/mobile/scripts/buildStatusGo.sh +++ b/mobile/scripts/buildStatusGo.sh @@ -26,6 +26,12 @@ fi echo "Building status-go for $ARCH using compiler: $CC" cd "$STATUS_GO" + +if [[ "$OS" == "android" ]]; then + echo "Generating android SDS bindings" + make generate-sds-android V=3 SHELL=/bin/sh +fi + make generate V=3 SHELL=/bin/sh mkdir -p build/bin/statusgo-lib From 74ad340f610668a1c638dc6aa2b9205569f47537 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Wed, 27 Aug 2025 18:45:52 +0200 Subject: [PATCH 04/29] buildStatusGo export ANDROID_TARGET and ANDROID_NDK_HOME --- mobile/scripts/buildStatusGo.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mobile/scripts/buildStatusGo.sh b/mobile/scripts/buildStatusGo.sh index 305bcf80ae5..cb1ecb3cb9b 100755 --- a/mobile/scripts/buildStatusGo.sh +++ b/mobile/scripts/buildStatusGo.sh @@ -29,6 +29,8 @@ cd "$STATUS_GO" if [[ "$OS" == "android" ]]; then echo "Generating android SDS bindings" + export ANDROID_TARGET=28 + export ANDROID_NDK_HOME="/opt/android-sdk/ndk/27.2.12479018/" make generate-sds-android V=3 SHELL=/bin/sh fi From db7f780e13a69c711e9b8352784d4789edfa659b Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Thu, 28 Aug 2025 13:54:03 +0200 Subject: [PATCH 05/29] add GOOS and GOARCH in EnvVariables.mk --- mobile/scripts/EnvVariables.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mobile/scripts/EnvVariables.mk b/mobile/scripts/EnvVariables.mk index 1a25e510aa0..c826bc4c529 100644 --- a/mobile/scripts/EnvVariables.mk +++ b/mobile/scripts/EnvVariables.mk @@ -77,6 +77,7 @@ ifeq ($(OS), ios) export LIBRARY_PATH:=${SDKROOT}/usr/lib:${LIBRARY_PATH} export LIB_EXT := .a else + export GOOS=android export ANDROID_API export AR=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${HOST_OS}-x86_64/bin/llvm-ar export AS=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${HOST_OS}-x86_64/bin/llvm-as @@ -85,6 +86,7 @@ else ifeq ($(ARCH), arm64) export ANDROID_ABI=arm64-v8a + export GOARCH=arm64 else ifeq ($(ARCH), arm) export ANDROID_ABI=armeabi-v7a else From 7a989c5a1129af4ec98dd1ede3e7fe6a54b4184f Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Thu, 28 Aug 2025 14:47:26 +0200 Subject: [PATCH 06/29] bump status-go vendor --- vendor/status-go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/status-go b/vendor/status-go index 0f399b12a52..dc5c04caa62 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 0f399b12a52a834cb5e30813ad1d3e11c9132d97 +Subproject commit dc5c04caa62a8e45380600a11e429ada07204272 From 3b7fc8713e2958270767c46db3bee1dfce482b04 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Thu, 28 Aug 2025 15:01:53 +0200 Subject: [PATCH 07/29] revert previous change --- vendor/status-go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/status-go b/vendor/status-go index dc5c04caa62..60b59842aec 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit dc5c04caa62a8e45380600a11e429ada07204272 +Subproject commit 60b59842aec3ead182a3c12e87782c629ee3d0f0 From 39be774b27333e73516850646a32f3b4a85296a0 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Thu, 28 Aug 2025 15:35:50 +0200 Subject: [PATCH 08/29] temporary change add more log level make --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0433953d12f..f639a09b594 100644 --- a/Makefile +++ b/Makefile @@ -908,7 +908,7 @@ mobile-run: deps-common mobile-build: | deps-common echo -e "\033[92mBuilding:\033[39m mobile app" - $(MAKE) -C mobile + $(MAKE) -C mobile V=3 mobile-clean: echo -e "\033[92mCleaning:\033[39m mobile app" From e88b9940e7bd5950d4cf222dbfbf67ad38a359ec Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Thu, 28 Aug 2025 15:59:34 +0200 Subject: [PATCH 09/29] rm GOOS and GOARCH env vars --- mobile/scripts/EnvVariables.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/mobile/scripts/EnvVariables.mk b/mobile/scripts/EnvVariables.mk index c826bc4c529..1a25e510aa0 100644 --- a/mobile/scripts/EnvVariables.mk +++ b/mobile/scripts/EnvVariables.mk @@ -77,7 +77,6 @@ ifeq ($(OS), ios) export LIBRARY_PATH:=${SDKROOT}/usr/lib:${LIBRARY_PATH} export LIB_EXT := .a else - export GOOS=android export ANDROID_API export AR=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${HOST_OS}-x86_64/bin/llvm-ar export AS=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${HOST_OS}-x86_64/bin/llvm-as @@ -86,7 +85,6 @@ else ifeq ($(ARCH), arm64) export ANDROID_ABI=arm64-v8a - export GOARCH=arm64 else ifeq ($(ARCH), arm) export ANDROID_ABI=armeabi-v7a else From 7b33f3e66f28f6a189853322fbe8a7437bccb9ef Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Thu, 28 Aug 2025 16:25:07 +0200 Subject: [PATCH 10/29] export GOOS GOARCH --- mobile/scripts/EnvVariables.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mobile/scripts/EnvVariables.mk b/mobile/scripts/EnvVariables.mk index 1a25e510aa0..07d9d8d8de6 100644 --- a/mobile/scripts/EnvVariables.mk +++ b/mobile/scripts/EnvVariables.mk @@ -93,6 +93,8 @@ else export LIB_EXT := .so endif +export GOOS=$(shell go env GOHOSTOS) +export GOARCH=$(shell go env GOHOSTARCH) # Verify tools are installed QMAKE := $(shell which qmake) From e841d464e48a0aa3275e32aef25e23d318fbbed3 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Thu, 28 Aug 2025 17:05:21 +0200 Subject: [PATCH 11/29] avoid make generate in Android --- mobile/scripts/buildStatusGo.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mobile/scripts/buildStatusGo.sh b/mobile/scripts/buildStatusGo.sh index cb1ecb3cb9b..d10f0547397 100755 --- a/mobile/scripts/buildStatusGo.sh +++ b/mobile/scripts/buildStatusGo.sh @@ -32,9 +32,11 @@ if [[ "$OS" == "android" ]]; then export ANDROID_TARGET=28 export ANDROID_NDK_HOME="/opt/android-sdk/ndk/27.2.12479018/" make generate-sds-android V=3 SHELL=/bin/sh +else + make generate V=3 SHELL=/bin/sh fi -make generate V=3 SHELL=/bin/sh +echo "AAA compiling jamon" mkdir -p build/bin/statusgo-lib go run cmd/library/main.go cmd/library/const.go > build/bin/statusgo-lib/main.go From 3c61b026fd8a61a582b5bcdd06d81ec2a3342ae0 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Thu, 28 Aug 2025 17:20:15 +0200 Subject: [PATCH 12/29] update GOOS and GOARCH when statusgo-lib/main.go --- mobile/scripts/buildStatusGo.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mobile/scripts/buildStatusGo.sh b/mobile/scripts/buildStatusGo.sh index d10f0547397..6affa89ce4c 100755 --- a/mobile/scripts/buildStatusGo.sh +++ b/mobile/scripts/buildStatusGo.sh @@ -36,10 +36,9 @@ else make generate V=3 SHELL=/bin/sh fi -echo "AAA compiling jamon" - mkdir -p build/bin/statusgo-lib -go run cmd/library/main.go cmd/library/const.go > build/bin/statusgo-lib/main.go +GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \ + go run cmd/library/main.go cmd/library/const.go > build/bin/statusgo-lib/main.go GOFLAGS="" CGO_CFLAGS="-Os -flto" CGO_LDFLAGS="-Os -flto" CGO_ENABLED=1 GOOS="$OS" GOARCH="$GOARCH" \ go build \ From b67cc539e0047daf678d73cbfe05875bfa36befe Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Thu, 28 Aug 2025 17:39:28 +0200 Subject: [PATCH 13/29] try make generate again with correct GOOS and GOHOSTOS --- mobile/scripts/buildStatusGo.sh | 4 ++-- vendor/status-go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/scripts/buildStatusGo.sh b/mobile/scripts/buildStatusGo.sh index 6affa89ce4c..eedca0c5ab6 100755 --- a/mobile/scripts/buildStatusGo.sh +++ b/mobile/scripts/buildStatusGo.sh @@ -32,10 +32,10 @@ if [[ "$OS" == "android" ]]; then export ANDROID_TARGET=28 export ANDROID_NDK_HOME="/opt/android-sdk/ndk/27.2.12479018/" make generate-sds-android V=3 SHELL=/bin/sh -else - make generate V=3 SHELL=/bin/sh fi +make generate V=3 SHELL=/bin/sh + mkdir -p build/bin/statusgo-lib GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \ go run cmd/library/main.go cmd/library/const.go > build/bin/statusgo-lib/main.go diff --git a/vendor/status-go b/vendor/status-go index 60b59842aec..93d5fd95a7a 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 60b59842aec3ead182a3c12e87782c629ee3d0f0 +Subproject commit 93d5fd95a7af9b0a43866956634b521a6064a551 From ef627397088b5d8b5021b2c3c074ea0643ccc65d Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Thu, 28 Aug 2025 17:58:54 +0200 Subject: [PATCH 14/29] bump status-go --- vendor/status-go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/status-go b/vendor/status-go index 93d5fd95a7a..c1f7a23f736 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 93d5fd95a7af9b0a43866956634b521a6064a551 +Subproject commit c1f7a23f73645d501c87822b3ed5ed0ec9a90d90 From c1b15e919e5763531916bd8cab8e7a6e2c53d5e4 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Thu, 28 Aug 2025 18:27:07 +0200 Subject: [PATCH 15/29] status-go bump --- vendor/status-go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/status-go b/vendor/status-go index c1f7a23f736..b18d7c2ce5d 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit c1f7a23f73645d501c87822b3ed5ed0ec9a90d90 +Subproject commit b18d7c2ce5dd73f4aca9749cd34567b33e9bd5e2 From c53cdeba60fa42ef69b635d1ea664294e464a7f4 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Fri, 29 Aug 2025 16:07:54 +0200 Subject: [PATCH 16/29] build ANDROID_TARGET=35 --- mobile/scripts/buildStatusGo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/scripts/buildStatusGo.sh b/mobile/scripts/buildStatusGo.sh index eedca0c5ab6..08d94aaceeb 100755 --- a/mobile/scripts/buildStatusGo.sh +++ b/mobile/scripts/buildStatusGo.sh @@ -29,7 +29,7 @@ cd "$STATUS_GO" if [[ "$OS" == "android" ]]; then echo "Generating android SDS bindings" - export ANDROID_TARGET=28 + export ANDROID_TARGET=35 export ANDROID_NDK_HOME="/opt/android-sdk/ndk/27.2.12479018/" make generate-sds-android V=3 SHELL=/bin/sh fi From e46fcdf9579defbf16b0722df5842ffa3f685872 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Fri, 29 Aug 2025 16:23:46 +0200 Subject: [PATCH 17/29] add libsds.so to the resulting Status-tablet apk --- mobile/wrapperApp/Status-tablet.pro | 1 + scripts/fix_app_dir.sh | 3 ++- scripts/init_app_dir.sh | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mobile/wrapperApp/Status-tablet.pro b/mobile/wrapperApp/Status-tablet.pro index dd014e611d0..4aabc34f2d9 100644 --- a/mobile/wrapperApp/Status-tablet.pro +++ b/mobile/wrapperApp/Status-tablet.pro @@ -33,6 +33,7 @@ android { $$PWD/../lib/android/$$LIB_PREFIX/libnim_status_client.so \ $$PWD/../lib/android/$$LIB_PREFIX/libDOtherSide$$(LIB_SUFFIX)$$(LIB_EXT) \ $$PWD/../lib/android/$$LIB_PREFIX/libstatus.so \ + $$PWD/../lib/android/$$LIB_PREFIX/libsds.so \ $$PWD/../lib/android/$$LIB_PREFIX/libStatusQ$$(LIB_SUFFIX)$$(LIB_EXT) } diff --git a/scripts/fix_app_dir.sh b/scripts/fix_app_dir.sh index 39e1d66a9ae..28fcca53374 100755 --- a/scripts/fix_app_dir.sh +++ b/scripts/fix_app_dir.sh @@ -10,7 +10,8 @@ if [[ ! -z "${IN_NIX_SHELL}" ]]; then patchelf --set-rpath '$ORIGIN' \ "${APP_DIR}/usr/lib/libcom_err.so.3" \ - "${APP_DIR}/usr/lib/libstatus.so" + "${APP_DIR}/usr/lib/libstatus.so" \ + "${APP_DIR}/usr/lib/libsds.so" patchelf --set-rpath '$ORIGIN/../' \ "${APP_DIR}"/usr/lib/gstreamer-1.0/* \ diff --git a/scripts/init_app_dir.sh b/scripts/init_app_dir.sh index 31521a735d7..00ac0a8a9ee 100755 --- a/scripts/init_app_dir.sh +++ b/scripts/init_app_dir.sh @@ -24,6 +24,7 @@ cp -R resources.rcc "${APP_DIR}/usr/" cp bin/i18n/* "${APP_DIR}/usr/i18n" cp vendor/status-go/build/bin/libstatus.so "${APP_DIR}/usr/lib/" cp vendor/status-go/build/bin/libstatus.so.0 "${APP_DIR}/usr/lib/" +cp vendor/status-go/build/bin/libsds.so "${APP_DIR}/usr/lib/" cp "${STATUSKEYCARDGO}" "${APP_DIR}/usr/lib/" if [ "${USE_NWAKU}" = "true" ]; then cp vendor/status-go/vendor/github.com/waku-org/waku-go-bindings/third_party/nwaku/build/libwaku.so "${APP_DIR}/usr/lib/" From 47cf960cdbf51d909007fba28dece47fdae4f598 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Fri, 29 Aug 2025 16:26:34 +0200 Subject: [PATCH 18/29] restoring sds target to 28 --- mobile/scripts/buildStatusGo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/scripts/buildStatusGo.sh b/mobile/scripts/buildStatusGo.sh index 08d94aaceeb..eedca0c5ab6 100755 --- a/mobile/scripts/buildStatusGo.sh +++ b/mobile/scripts/buildStatusGo.sh @@ -29,7 +29,7 @@ cd "$STATUS_GO" if [[ "$OS" == "android" ]]; then echo "Generating android SDS bindings" - export ANDROID_TARGET=35 + export ANDROID_TARGET=28 export ANDROID_NDK_HOME="/opt/android-sdk/ndk/27.2.12479018/" make generate-sds-android V=3 SHELL=/bin/sh fi From ca2b5a939d82ed276c27b041de2162801a42d6bd Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Fri, 29 Aug 2025 17:14:13 +0200 Subject: [PATCH 19/29] add SDS_LIB --- mobile/scripts/Common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/mobile/scripts/Common.mk b/mobile/scripts/Common.mk index e13500b57ac..6a038dca8ca 100644 --- a/mobile/scripts/Common.mk +++ b/mobile/scripts/Common.mk @@ -64,6 +64,7 @@ RUN_SCRIPT := $(SCRIPTS_PATH)/$(OS)/run.sh # lib files STATUS_GO_LIB := $(LIB_PATH)/libstatus$(LIB_EXT) +SDS_LIB := $(LIB_PATH)/libsds$(LIB_EXT) STATUS_Q_LIB := $(LIB_PATH)/libStatusQ$(LIB_SUFFIX)$(LIB_EXT) OPENSSL_LIB := $(LIB_PATH)/libssl_3$(LIB_EXT) QRCODEGEN_LIB := $(LIB_PATH)/libqrcodegen.a From db9d182338ed3d90ea2d64736e1fd822f9bb9d7e Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Fri, 29 Aug 2025 17:22:50 +0200 Subject: [PATCH 20/29] properly cp libsds.so --- scripts/init_app_dir.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/init_app_dir.sh b/scripts/init_app_dir.sh index 00ac0a8a9ee..cbbd753da47 100755 --- a/scripts/init_app_dir.sh +++ b/scripts/init_app_dir.sh @@ -24,7 +24,7 @@ cp -R resources.rcc "${APP_DIR}/usr/" cp bin/i18n/* "${APP_DIR}/usr/i18n" cp vendor/status-go/build/bin/libstatus.so "${APP_DIR}/usr/lib/" cp vendor/status-go/build/bin/libstatus.so.0 "${APP_DIR}/usr/lib/" -cp vendor/status-go/build/bin/libsds.so "${APP_DIR}/usr/lib/" +cp vendor/status-go/vendor/github.com/waku-org/sds-go-bindings/third_party/nim-sds/build/libsds.so "${APP_DIR}/usr/lib/" cp "${STATUSKEYCARDGO}" "${APP_DIR}/usr/lib/" if [ "${USE_NWAKU}" = "true" ]; then cp vendor/status-go/vendor/github.com/waku-org/waku-go-bindings/third_party/nwaku/build/libwaku.so "${APP_DIR}/usr/lib/" From 4da571dfee2291782bd327ec04b9687bcc937dd7 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Fri, 29 Aug 2025 17:22:58 +0200 Subject: [PATCH 21/29] typo fix --- mobile/wrapperApp/Status-tablet.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/wrapperApp/Status-tablet.pro b/mobile/wrapperApp/Status-tablet.pro index 4aabc34f2d9..50bb5323c38 100644 --- a/mobile/wrapperApp/Status-tablet.pro +++ b/mobile/wrapperApp/Status-tablet.pro @@ -22,7 +22,7 @@ QMLPATHS += $$QML_IMPORT_PATH LIB_PREFIX = qt$$QT_MAJOR_VERSION/$$(APP_VARIANT) android { - message("cofiguring for android $${QT_ARCH}, $$(ANDROID_ABI)") + message("configuring for android $${QT_ARCH}, $$(ANDROID_ABI)") ANDROID_PACKAGE_SOURCE_DIR = $$PWD/../android/qt$$QT_MAJOR_VERSION From 5695f2f237d2031b38d013428b9d141217608779 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Fri, 29 Aug 2025 17:51:28 +0200 Subject: [PATCH 22/29] copy libsds.so library --- mobile/scripts/buildStatusGo.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/mobile/scripts/buildStatusGo.sh b/mobile/scripts/buildStatusGo.sh index eedca0c5ab6..585206a63d4 100755 --- a/mobile/scripts/buildStatusGo.sh +++ b/mobile/scripts/buildStatusGo.sh @@ -32,6 +32,7 @@ if [[ "$OS" == "android" ]]; then export ANDROID_TARGET=28 export ANDROID_NDK_HOME="/opt/android-sdk/ndk/27.2.12479018/" make generate-sds-android V=3 SHELL=/bin/sh + cp vendor/github.com/waku-org/sds-go-bindings/sds/third_party/nim-sds/build/libsds.so "$LIB_DIR/libsds.$LIB_EXT" fi make generate V=3 SHELL=/bin/sh From 17ad6f810c5bc4e8fd89282231ca8604242dccf9 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Fri, 29 Aug 2025 18:14:35 +0200 Subject: [PATCH 23/29] fix path libsds.so cp --- mobile/scripts/buildStatusGo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/scripts/buildStatusGo.sh b/mobile/scripts/buildStatusGo.sh index 585206a63d4..e171761aa02 100755 --- a/mobile/scripts/buildStatusGo.sh +++ b/mobile/scripts/buildStatusGo.sh @@ -32,7 +32,7 @@ if [[ "$OS" == "android" ]]; then export ANDROID_TARGET=28 export ANDROID_NDK_HOME="/opt/android-sdk/ndk/27.2.12479018/" make generate-sds-android V=3 SHELL=/bin/sh - cp vendor/github.com/waku-org/sds-go-bindings/sds/third_party/nim-sds/build/libsds.so "$LIB_DIR/libsds.$LIB_EXT" + cp vendor/status-go/vendor/github.com/waku-org/sds-go-bindings/sds/third_party/nim-sds/build/libsds.so "$LIB_DIR/libsds.$LIB_EXT" fi make generate V=3 SHELL=/bin/sh From 38fb40d38ec8a7d0e5ed799f2de18e50a8a39550 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Fri, 29 Aug 2025 18:31:59 +0200 Subject: [PATCH 24/29] fix cp path with STATUS_GO var --- mobile/scripts/buildStatusGo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/scripts/buildStatusGo.sh b/mobile/scripts/buildStatusGo.sh index e171761aa02..b571f323218 100755 --- a/mobile/scripts/buildStatusGo.sh +++ b/mobile/scripts/buildStatusGo.sh @@ -32,7 +32,7 @@ if [[ "$OS" == "android" ]]; then export ANDROID_TARGET=28 export ANDROID_NDK_HOME="/opt/android-sdk/ndk/27.2.12479018/" make generate-sds-android V=3 SHELL=/bin/sh - cp vendor/status-go/vendor/github.com/waku-org/sds-go-bindings/sds/third_party/nim-sds/build/libsds.so "$LIB_DIR/libsds.$LIB_EXT" + cp $STATUS_GO/vendor/github.com/waku-org/sds-go-bindings/sds/third_party/nim-sds/build/libsds.so "$LIB_DIR/libsds.$LIB_EXT" fi make generate V=3 SHELL=/bin/sh From 8af5596dfcf94abb41622bcdfc86a2fac8428a4d Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Fri, 29 Aug 2025 18:45:30 +0200 Subject: [PATCH 25/29] fix path cp libsds.so --- mobile/scripts/buildStatusGo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/scripts/buildStatusGo.sh b/mobile/scripts/buildStatusGo.sh index b571f323218..f5ecbec0be6 100755 --- a/mobile/scripts/buildStatusGo.sh +++ b/mobile/scripts/buildStatusGo.sh @@ -32,7 +32,7 @@ if [[ "$OS" == "android" ]]; then export ANDROID_TARGET=28 export ANDROID_NDK_HOME="/opt/android-sdk/ndk/27.2.12479018/" make generate-sds-android V=3 SHELL=/bin/sh - cp $STATUS_GO/vendor/github.com/waku-org/sds-go-bindings/sds/third_party/nim-sds/build/libsds.so "$LIB_DIR/libsds.$LIB_EXT" + cp $STATUS_GO/vendor/github.com/waku-org/sds-go-bindings/third_party/nim-sds/build/libsds.so "$LIB_DIR/libsds.$LIB_EXT" fi make generate V=3 SHELL=/bin/sh From f9d956750490803f5ba8411a873e4ef7e7189419 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Fri, 29 Aug 2025 19:14:56 +0200 Subject: [PATCH 26/29] android-build add default/ to path to upload --- .github/workflows/android-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index b364073ec8d..05782ab9a74 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -80,5 +80,5 @@ jobs: uses: actions/upload-artifact@v4 with: name: Status-tablet - path: mobile/bin/android/qt6/Status-tablet.apk + path: mobile/bin/android/qt6/default/Status-tablet.apk From deaec448189dd48ee8b39b19325a2c0553d3acf9 Mon Sep 17 00:00:00 2001 From: Ivan FB Date: Thu, 11 Sep 2025 15:04:39 +0200 Subject: [PATCH 27/29] update status-go for win support --- vendor/status-go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/status-go b/vendor/status-go index b18d7c2ce5d..5af0755adba 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit b18d7c2ce5dd73f4aca9749cd34567b33e9bd5e2 +Subproject commit 5af0755adba92cb78813b61ee0127581327a4a8e From 2654af0678a3a3a9ab5e54dd7940aba4a2621c0a Mon Sep 17 00:00:00 2001 From: Ivan FB Date: Thu, 11 Sep 2025 15:54:00 +0200 Subject: [PATCH 28/29] Update modules.txt in status-go --- vendor/status-go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/status-go b/vendor/status-go index 5af0755adba..b072922abdd 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 5af0755adba92cb78813b61ee0127581327a4a8e +Subproject commit b072922abddfe601694ce266d67ac60fffa7caec From 6424862ad1a899268e67238ea062231616402096 Mon Sep 17 00:00:00 2001 From: Ivan FB Date: Thu, 11 Sep 2025 17:29:26 +0200 Subject: [PATCH 29/29] update vendor/status-go/ --- vendor/status-go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/status-go b/vendor/status-go index b072922abdd..18566623f2a 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit b072922abddfe601694ce266d67ac60fffa7caec +Subproject commit 18566623f2aca7eebd8ffe42cacdf5e6ff401d74