From a6c0bca680b08084b8e3609bc5792f45e5a63334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Fri, 5 Mar 2021 23:09:24 +0800 Subject: [PATCH] Update v2ray-core --- .github/workflows/debug.yml | 2 +- .github/workflows/release.yml | 2 +- README.md | 4 ++-- bin/fdroid/build.sh | 4 ---- bin/fdroid/prebuild.sh | 29 +++++++++++------------------ bin/init/env.sh | 28 ++++++++++++++++++++++------ bin/libs/v2ray/build.sh | 2 +- v2ray | 2 +- 8 files changed, 39 insertions(+), 34 deletions(-) diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 79eecf8a6..83d38a3cc 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -152,7 +152,7 @@ jobs: uses: actions/setup-go@v2 if: steps.cache.outputs.cache-hit != 'true' with: - go-version: 1.15 + go-version: 1.16 - name: Native Build if: steps.cache.outputs.cache-hit != 'true' run: ./run libs v2ray diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c0500961d..9d13e1a45 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -167,7 +167,7 @@ jobs: uses: actions/setup-go@v2 if: steps.cache.outputs.cache-hit != 'true' with: - go-version: 1.15 + go-version: 1.16 - name: Native Build if: steps.cache.outputs.cache-hit != 'true' run: ./run libs v2ray diff --git a/README.md b/README.md index 0f9e0c94c..bd393b403 100644 --- a/README.md +++ b/README.md @@ -83,10 +83,10 @@ Consider using a Linux VM or dual booting.** It is recommended to use [AndroidStudio](https://developer.android.com/studio) to install. -2. Install golang ( 1.15 ). +2. Install golang ( 1.16 ). ```shell # debian sid -apt install -y golang +apt install -y golang-1.16 ``` 3. Install Rust and its stdlib for Android ABIs, and add environment variables for it. diff --git a/bin/fdroid/build.sh b/bin/fdroid/build.sh index e2ac48c28..0dbced11d 100755 --- a/bin/fdroid/build.sh +++ b/bin/fdroid/build.sh @@ -3,10 +3,6 @@ source $HOME/.bashrc source "bin/init/env.sh" -# Import golang -export PATH=$PATH:$HOME/.go/bin -export PATH=$PATH:$(go env GOPATH)/bin - # Native dependencies bin/init/libs/ffmpeg.sh bin/init/libs/boringssl.sh diff --git a/bin/fdroid/prebuild.sh b/bin/fdroid/prebuild.sh index 3bfb088b0..a1423b6f1 100755 --- a/bin/fdroid/prebuild.sh +++ b/bin/fdroid/prebuild.sh @@ -1,33 +1,26 @@ #!/usr/bin/env bash +source "bin/init/env.sh" + ## Install rust curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain none -y source $HOME/.cargo/env rustup install $(cat ss-rust/src/main/rust/shadowsocks-rust/rust-toolchain) rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android -echo "rust.rustcCommand=$HOME/.cargo/bin/rustc" >> local.properties -echo "rust.cargoCommand=$HOME/.cargo/bin/cargo" >> local.properties -echo "rust.pythonCommand=/usr/bin/python3" >> local.properties +echo "rust.rustcCommand=$HOME/.cargo/bin/rustc" >>local.properties +echo "rust.cargoCommand=$HOME/.cargo/bin/cargo" >>local.properties +echo "rust.pythonCommand=/usr/bin/python3" >>local.properties # Install Golang -curl -o golang.tar.gz https://storage.googleapis.com/golang/go1.15.8.linux-amd64.tar.gz -mkdir -p "$HOME/.go" -tar -C "$HOME/.go" --strip-components=1 -xzf golang.tar.gz +curl -o golang.tar.gz https://storage.googleapis.com/golang/go1.16.linux-amd64.tar.gz +tar -C "/usr/local/lib/go-1.16" --strip-components=1 -xzf golang.tar.gz rm golang.tar.gz -export PATH=$PATH:$HOME/.go/bin +export PATH="$PATH:/usr/local/lib/go-1.16/bin" go version -# Find Android NDK -_NDK="$ANDROID_HOME/ndk/21.3.6528147" -[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_NDK_HOME" -[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/ndk-bundle" -[ -f "$_NDK/source.properties" ] || echo "Error: NDK Not found" -ANDROID_NDK_HOME=$_NDK - -echo "NDK Found: $_NDK" -echo "sdk.dir=$ANDROID_HOME" >> local.properties -echo "ndk.dir=$ANDROID_NDK_HOME" >> local.properties +echo "sdk.dir=$ANDROID_HOME" >>local.properties +echo "ndk.dir=$ANDROID_NDK_HOME" >>local.properties bin/libs/v2ray/init.sh @@ -48,4 +41,4 @@ popd rm -r ssr-libev/src/main/jni/pcre/dist/testdata rm -r ssr-libev/src/main/jni/mbedtls/programs/fuzz/corpuses -rm -r ssr-libev/src/main/jni/mbedtls/tests/data_files \ No newline at end of file +rm -r ssr-libev/src/main/jni/mbedtls/tests/data_files diff --git a/bin/init/env.sh b/bin/init/env.sh index d8177bc13..67f8fd978 100755 --- a/bin/init/env.sh +++ b/bin/init/env.sh @@ -6,12 +6,28 @@ if [ -z "$ANDROID_HOME" ]; then fi fi -if [ -f "$ANDROID_HOME/ndk-bundle/source.properties" ]; then - export NDK=$ANDROID_HOME/ndk-bundle -else - export NDK=$ANDROID_HOME/ndk/21.3.6528147 +_NDK="$ANDROID_HOME/ndk/21.3.6528147" +[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_NDK_HOME" +[ -f "$_NDK/source.properties" ] || _NDK="$NDK" +[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/ndk-bundle" + +if [ ! -f "$_NDK/source.properties" ]; then + echo "Error: NDK not found." + exit 1 fi -export ANDROID_NDK_HOME=$NDK +export ANDROID_NDK_HOME=$_NDK +export NDK=$_NDK +export PROJECT=$(realpath .) -export PROJECT=$(realpath .) \ No newline at end of file +if [ ! $(command -v go) ]; then + if [ -d /usr/lib/go-1.16 ]; then + export PATH=$PATH:/usr/lib/go-1.16/bin + elif [ -d /usr/local/lib/go-1.16 ]; then + export PATH=$PATH:/usr/local/lib/go-1.16/bin + fi +fi + +if [ $(command -v go) ]; then + export PATH=$PATH:$(go env GOPATH)/bin +fi diff --git a/bin/libs/v2ray/build.sh b/bin/libs/v2ray/build.sh index 0bec05b81..909d4aa69 100755 --- a/bin/libs/v2ray/build.sh +++ b/bin/libs/v2ray/build.sh @@ -2,7 +2,7 @@ source "bin/init/env.sh" export GO111MOUDLE=on -export PATH="$PATH:$(go env GOPATH)/bin" +export GO386=softfloat cd "$PROJECT/v2ray" gomobile init diff --git a/v2ray b/v2ray index 51c769d45..c936583bb 160000 --- a/v2ray +++ b/v2ray @@ -1 +1 @@ -Subproject commit 51c769d4581866192e146b90dda6652c1f922f82 +Subproject commit c936583bb4e0d776467d8c80d4d80b7516c9262e