diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index df495f3..9327ca6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: uses: nttld/setup-ndk@v1 id: setup-ndk with: - ndk-version: r16b + ndk-version: r26d - name: Setup Go Environment uses: actions/setup-go@master diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4fcedb1..b10c83a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: uses: nttld/setup-ndk@v1 id: setup-ndk with: - ndk-version: r16b + ndk-version: r26d - name: Setup Go Environment uses: actions/setup-go@master @@ -28,7 +28,6 @@ jobs: BUILD_MACHINE: linux run: | echo NDK path is $NDK_HOME - ls -l $NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/armeabi-v7a-hard make -e - name: Build and Run Tests diff --git a/Makefile b/Makefile index 8401b3e..02b5b78 100644 --- a/Makefile +++ b/Makefile @@ -22,11 +22,8 @@ TEST_EXPECTED := '{"code":200,' all: @BUILD_PATH=$(BUILD_PATH)/aarch64 TARGET_ARCH=aarch64 GOARCH=arm64 $(MAKE) -e shared @BUILD_PATH=$(BUILD_PATH)/armv7a TARGET_ARCH=armv7a GOARCH=arm GOARM=7 TARGET_SDK=androideabi23 $(MAKE) -e shared - @BUILD_PATH=$(BUILD_PATH)/arm TARGET_ARCH=arm GOARCH=arm GOARM=5 TARGET_SDK=androideabi23 $(MAKE) -e shared @BUILD_PATH=$(BUILD_PATH)/i686 TARGET_ARCH=i686 GOARCH=amd64 $(MAKE) -e shared @BUILD_PATH=$(BUILD_PATH)/x86_64 TARGET_ARCH=x86_64 GOARCH=386 $(MAKE) -e shared - @BUILD_PATH=$(BUILD_PATH)/mips TARGET_ARCH=mips GOOS=linux GOARCH=mipsel GOMIPS=softfloat $(MAKE) -e shared - @BUILD_PATH=$(BUILD_PATH)/mips64 TARGET_ARCH=mips64 GOOS=linux GOARCH=mips64el $(MAKE) -e shared rm -rf $(BUILD_PATH)/*/*.h cd $(BUILD_PATH) && gzip -9 -k aarch64/* armv7a/* i686/* x86_64/* find $(BUILD_PATH) -mindepth 1 -maxdepth 1 -type d -exec mv {}/lib$(PROJECT_NAME).so.gz {}_lib$(PROJECT_NAME).so.gz \;; \