Fix Android build (#23)

* Upgrade Android NDK

* Use Android emulator 30.7.3 on macos
This commit is contained in:
Fabrice Drouin 2021-06-28 10:31:57 +02:00 committed by GitHub
parent b544b24cc3
commit 9c1afc715a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 5 deletions

View File

@ -32,7 +32,7 @@ jobs:
shell: bash
run: |
echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
echo "ANDROID_NDK_VERSION=21.3.6528147" >> $GITHUB_ENV
echo "ANDROID_NDK_VERSION=21.4.7075529" >> $GITHUB_ENV
- name: Cached Android NDK
uses: actions/cache@v2
with:
@ -80,6 +80,8 @@ jobs:
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
emulator-build: 7425822 # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
ndk: ${{ env.ANDROID_NDK_VERSION }}
cmake: 3.10.2.4988404
script: ./gradlew connectedCheck

View File

@ -41,7 +41,7 @@ jobs:
shell: bash
run: |
echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
echo "ANDROID_NDK_VERSION=21.3.6528147" >> $GITHUB_ENV
echo "ANDROID_NDK_VERSION=21.4.7075529" >> $GITHUB_ENV
- name: Cached Android NDK
uses: actions/cache@v2
with:
@ -89,6 +89,8 @@ jobs:
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
-build: 7425822 # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
ndk: ${{ env.ANDROID_NDK_VERSION }}
cmake: 3.10.2.4988404
script: ./gradlew connectedCheck

View File

@ -47,7 +47,7 @@ jobs:
shell: bash
run: |
echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
echo "ANDROID_NDK_VERSION=21.3.6528147" >> $GITHUB_ENV
echo "ANDROID_NDK_VERSION=21.4.7075529" >> $GITHUB_ENV
- name: Cached Android NDK
uses: actions/cache@v2
with:
@ -95,6 +95,8 @@ jobs:
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
emulator-build: 7425822 # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
ndk: ${{ env.ANDROID_NDK_VERSION }}
cmake: 3.10.2.4988404
script: ./gradlew connectedCheck

View File

@ -35,7 +35,7 @@ android {
setPath("src/main/CMakeLists.txt")
}
}
ndkVersion = "21.3.6528147"
ndkVersion = "21.4.7075529"
afterEvaluate {
tasks.withType<com.android.build.gradle.tasks.factory.AndroidUnitTest>().all {