diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 965328c6..457569e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,36 +77,6 @@ jobs: fileName: 'libv2ray.aar' out-file-path: V2rayNG/app/libs/ - - name: Restore cached libhysteria2 - id: cache-libhysteria2-restore - uses: actions/cache/restore@v4 - with: - path: ${{ github.workspace }}/hysteria/libs - key: libhysteria2-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hysteria/HEAD') }}-${{ hashFiles('libhysteria2.sh') }} - - - name: Setup Golang - if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true' - uses: actions/setup-go@v5.4.0 - with: - go-version-file: 'AndroidLibXrayLite/go.mod' - cache: false - - - name: Build libhysteria2 - if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true' - run: | - bash libhysteria2.sh - - - name: Save libhysteria2 - if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true' - uses: actions/cache/save@v4 - with: - path: ${{ github.workspace }}/hysteria/libs - key: libhysteria2-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hysteria/HEAD') }}-${{ hashFiles('libhysteria2.sh') }} - - - name: Copy libhysteria2 - run: | - cp -r ${{ github.workspace }}/hysteria/libs ${{ github.workspace }}/V2rayNG/app - - name: Setup Java uses: actions/setup-java@v4.7.0 with: diff --git a/.gitmodules b/.gitmodules index 0e9eca3e..9149fd00 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "hysteria"] - path = hysteria - url = https://github.com/apernet/hysteria [submodule "AndroidLibXrayLite"] path = AndroidLibXrayLite url = https://github.com/2dust/AndroidLibXrayLite diff --git a/hysteria b/hysteria deleted file mode 160000 index 44a56435..00000000 --- a/hysteria +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 44a5643535bf63760659b2a8c76fde6330792ab8 diff --git a/libhysteria2.sh b/libhysteria2.sh deleted file mode 100644 index eef62e43..00000000 --- a/libhysteria2.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -targets=( - "aarch64-linux-android24 arm64 arm64-v8a" - "armv7a-linux-androideabi24 arm armeabi-v7a" - "x86_64-linux-android24 amd64 x86_64" - "i686-linux-android24 386 x86" -) - -cd "hysteria" || exit - -for target in "${targets[@]}"; do - IFS=' ' read -r ndk_target goarch abi <<< "$target" - - echo "Building for ${abi} with ${ndk_target} (${goarch})" - - CC="${NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/${ndk_target}-clang" CGO_ENABLED=1 GOOS=android GOARCH=$goarch go build -o libs/$abi/libhysteria2.so -trimpath -ldflags "-s -w -buildid=" -buildvcs=false ./app - - echo "Built libhysteria2.so for ${abi}" -done