From 9758d98aa665201215e62961ebe846f6bee66cca Mon Sep 17 00:00:00 2001 From: tiaga <10153548+tiaga@users.noreply.github.com> Date: Fri, 10 Oct 2025 20:32:49 +0000 Subject: [PATCH 1/3] chore: update dependencies --- go.mod | 6 ++---- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 9a4b75a..454ea8b 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.1 toolchain go1.23.6 require ( - github.com/matsuridayo/libneko v1.0.0 // replaced + github.com/matsuridayo/libneko v0.0.0-20240702024904-1c47a3af7199 github.com/miekg/dns v1.1.63 github.com/oschwald/maxminddb-golang v1.12.0 // indirect github.com/sagernet/sing v0.6.6-0.20250406121928-926a5a1e8bb7 @@ -88,8 +88,6 @@ require ( lukechampine.com/blake3 v1.3.0 // indirect ) -replace github.com/matsuridayo/libneko => ./libneko - -replace github.com/sagernet/sing-box => ./sing-box +replace github.com/sagernet/sing-box => github.com/matsuridayo/sing-box v0.0.0-20250410121602-01b72e129794 replace github.com/go-chi/chi/v5 v5.2.1 => github.com/go-chi/chi/v5 v5.2.2 diff --git a/go.sum b/go.sum index 176ab31..c4037bf 100644 --- a/go.sum +++ b/go.sum @@ -57,6 +57,10 @@ github.com/libdns/libdns v0.2.2 h1:O6ws7bAfRPaBsgAYt8MDe2HcNBGC29hkZ9MX2eUSX3s= github.com/libdns/libdns v0.2.2/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ= github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8= github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= +github.com/matsuridayo/libneko v0.0.0-20240702024904-1c47a3af7199 h1:zv8GdEqhTXnn52/svG9i3aQxAXRLxXK97gZpHoNUUYM= +github.com/matsuridayo/libneko v0.0.0-20240702024904-1c47a3af7199/go.mod h1:IRO07Queptz/rGFvEW+3Hmwpx7MCup6WiDs4p5jMt4g= +github.com/matsuridayo/sing-box v0.0.0-20250410121602-01b72e129794 h1:maFFS/T1I9tASm8CQILH/0fH6d7Lm0iql2P/UMlGMVo= +github.com/matsuridayo/sing-box v0.0.0-20250410121602-01b72e129794/go.mod h1:RLRdTK1idH4dzKVl0KfPyPfF5grTw71+JpI2M/kj/OE= github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g= github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw= github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U= From efe2c634bfee43f000428039a23208597748f128 Mon Sep 17 00:00:00 2001 From: tiaga <10153548+tiaga@users.noreply.github.com> Date: Wed, 8 Oct 2025 23:53:45 +0000 Subject: [PATCH 2/3] build: simplify env.sh --- scripts/env.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/env.sh b/scripts/env.sh index 36e6c80..03bcbed 100644 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -13,12 +13,6 @@ if [ -z "$ANDROID_HOME" ]; then fi export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/25.2.9519653" -export NDK="$ANDROID_NDK_HOME" - -if [[ ! -f "$ANDROID_NDK_HOME/source.properties" ]]; then - echo "ERROR: Android NDK not found!" - exit 1 -fi DEPS=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin From 34dac7ec209d12e9b2e5cc27d91b22bdd8e510ac Mon Sep 17 00:00:00 2001 From: tiaga <10153548+tiaga@users.noreply.github.com> Date: Fri, 10 Oct 2025 20:34:27 +0000 Subject: [PATCH 3/3] build: use sagernet/gomobile and improve build --- scripts/build.sh | 13 ++++++------- scripts/sources.sh | 25 ------------------------- 2 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 scripts/sources.sh diff --git a/scripts/build.sh b/scripts/build.sh index 8fa70ac..88625c4 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -6,28 +6,27 @@ set -e source $SCRIPT_DIR/env.sh -bash $SCRIPT_DIR/sources.sh - if [ -z "$GOPATH" ]; then - GOPATH=$(go env GOPATH) + GOPATH=$(go env GOPATH) fi PATH="$PATH:$GOPATH/bin" -GOMOBILE_VERSION="v0.0.0-20231127183840-76ac6878050a" +GOMOBILE_URL=github.com/sagernet/gomobile +GOMOBILE_VERSION="v0.1.4" cd "$SCRIPT_DIR/../" # Install gomobile if [ ! -f "$GOPATH/bin/gomobile" ]; then - go get -v "golang.org/x/mobile@$GOMOBILE_VERSION" - go install -v "$GOPATH/pkg/mod/golang.org/x/mobile@$GOMOBILE_VERSION/cmd/gomobile" + go get -v "$GOMOBILE_URL@$GOMOBILE_VERSION" + go install -v "$GOPATH/pkg/mod/$GOMOBILE_URL@$GOMOBILE_VERSION/cmd/gomobile" fi gomobile init gomobile bind -v \ -androidapi 21 \ -trimpath \ - -ldflags='-s -w' \ + -ldflags='-s -w -buildid=' \ -tags='with_conntrack,with_gvisor,with_quic,with_wireguard,with_utls,with_clash_api,with_ech' . rm -v "$GOPATH/bin/gomobile" "$GOPATH/bin/gobind" "$SCRIPT_DIR/../libcore-sources.jar" diff --git a/scripts/sources.sh b/scripts/sources.sh deleted file mode 100644 index b22a568..0000000 --- a/scripts/sources.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -set -e - -COMMIT_SING_BOX="01b72e129794acae89e1c7929d0ba5a63b0e67f8" -COMMIT_LIBNEKO="1c47a3af71990a7b2192e03292b4d246c308ef0b" -SCRIPT_DIR="$(dirname $(readlink -f $0))" - -if [[ -d "$SCRIPT_DIR/../sing-box" ]]; then - if [[ "$(git -C "$SCRIPT_DIR/../sing-box" rev-parse HEAD)" != "$COMMIT_SING_BOX" ]]; then - echo "ERROR: Wrong 'sing-box' commit hash!" - fi -else - git clone --no-checkout https://github.com/MatsuriDayo/sing-box "$SCRIPT_DIR/../sing-box" - git --git-dir="$SCRIPT_DIR/../sing-box/.git" -C "$SCRIPT_DIR/../sing-box" -c advice.detachedHead=false checkout "$COMMIT_SING_BOX" -fi - -if [[ -d "$SCRIPT_DIR/../libneko" ]]; then - if [[ "$(git -C "$SCRIPT_DIR/../libneko" rev-parse HEAD)" != "$COMMIT_LIBNEKO" ]]; then - echo "ERROR: Wrong 'libneko' commit hash!" - fi -else - git clone --no-checkout https://github.com/MatsuriDayo/libneko "$SCRIPT_DIR/../libneko" - git --git-dir="$SCRIPT_DIR/../libneko/.git" -C "$SCRIPT_DIR/../libneko" -c advice.detachedHead=false checkout "$COMMIT_LIBNEKO" -fi