Browse Source

Fix CI for #50

pull/62/head
nonlin-lin-chaos-order-etc-etal 8 months ago
parent
commit
bcb33bb106
  1. 11
      .github/workflows/android.yml
  2. 1
      README.md
  3. 4
      binary/jni/build_all.sh

11
.github/workflows/android.yml

@ -20,10 +20,9 @@ jobs: @@ -20,10 +20,9 @@ jobs:
- name: Build required modules
run: |
export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313
pushd app/jni
./build_boost.sh
./build_openssl.sh
./build_miniupnpc.sh
pushd binary/jni
export BUILD_SO=1
./build_all.sh
popd
- name: Build with Gradle
run: ./gradlew --no-daemon assembleDebug
@ -51,9 +50,7 @@ jobs: @@ -51,9 +50,7 @@ jobs:
run: |
export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313
pushd binary/jni
./build_boost.sh
./build_openssl.sh
./build_miniupnpc.sh
./build_all.sh
popd
- name: Build binaries with NDK
run: |

1
README.md

@ -55,6 +55,7 @@ export ANDROID_HOME=/opt/android-sdk @@ -55,6 +55,7 @@ export ANDROID_HOME=/opt/android-sdk
export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313
pushd binary/jni
export BUILD_SO=1
./build_all.sh
popd

4
binary/jni/build_all.sh

@ -5,5 +5,9 @@ fi @@ -5,5 +5,9 @@ fi
./build_boost.sh
./build_miniupnpc.sh
./build_openssl.sh
if [ -z "$BUILD_SO" -a "$BUILD_SO" == "" ]; then
export NDK_MODULE_PATH=`pwd` && export NDK_PROJECT_PATH=`pwd`/.. && $ANDROID_NDK_HOME/ndk-build V=1 NDK_LOG=1 -j`nproc`
else
export NDK_MODULE_PATH=`pwd` && export NDK_PROJECT_PATH=`pwd`/.. && ./ndkbuild-wrapper.sh V=1 NDK_LOG=1 -j`nproc`
fi
echo "$0 completed."

Loading…
Cancel
Save