Skip to content

Commit

Permalink
build(deps): bump ndk version to r24
Browse files Browse the repository at this point in the history
  • Loading branch information
mikehardy committed Apr 21, 2022
1 parent 9ffaf58 commit 506ea4b
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
# COULD_BE_BETTER: Consider turning this into a GitHub action - help the wider community
# NDK install (unzipping) is really noisy - silence the log spam with grep, while keeping errors
- name: Install NDK (silent)
run: .github/scripts/install_ndk.sh 22.0.7026061
run: .github/scripts/install_ndk.sh 24.0.8215888

- name: Install linker
run: .github/scripts/linux_install_x86_64-unknown-linux-gnu-gcc.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: mikehardy/setup-android@main

- name: Install NDK
run: .github/scripts/install_ndk.sh 22.0.7026061
run: .github/scripts/install_ndk.sh 24.0.8215888

- name: Test NDK
run: echo "NDK set to $ANDROID_NDK_HOME"
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
uses: mikehardy/setup-android@main

- name: Install NDK
run: .github/scripts/install_ndk.sh 22.0.7026061
run: .github/scripts/install_ndk.sh 24.0.8215888

- name: run tests
uses: reactivecircus/android-emulator-runner@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: mikehardy/setup-android@main

- name: Install NDK
run: .github/scripts/install_ndk.sh 22.0.7026061
run: .github/scripts/install_ndk.sh 24.0.8215888

- name: Install linker
run: .github/scripts/linux_install_x86_64-unknown-linux-gnu-gcc.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: mikehardy/setup-android@main

- name: Install NDK
run: .github/scripts/install_ndk.sh 22.0.7026061
run: .github/scripts/install_ndk.sh 24.0.8215888

# install cargo
- name: Install Rust
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/robolectric_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ jobs:
- name: Install Android Command Line Tools
uses: mikehardy/setup-android@main

- name: Install NDK (r22 - 22.0.7026061)
run: .github/scripts/install_ndk.sh 22.0.7026061
- name: Install NDK
run: .github/scripts/install_ndk.sh 24.0.8215888

# TODO: Needs investigation. This seemed to work before adding gnubin/v1, just with serde broken.
# Now it doesn't seem to be picked up by rust.
Expand Down Expand Up @@ -159,13 +159,13 @@ jobs:

- name: Install NDK (silent)
if: matrix.os != 'windows-latest'
run: .github/scripts/install_ndk.sh 22.0.7026061
run: .github/scripts/install_ndk.sh 24.0.8215888

- name: Install NDK (Windows - silent)
if: matrix.os == 'windows-latest'
run: |
Write-Host "NDK Install Started"
(. sdkmanager.bat --install "ndk;22.0.7026061" --sdk_root="$Env:ANDROID_SDK_ROOT") | out-null
(. sdkmanager.bat --install "ndk;24.0.8215888" --sdk_root="$Env:ANDROID_SDK_ROOT") | out-null
Write-Host "NDK Install Completed"
- name: Install Python Setuptools
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_gradle_wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
# COULD_BE_BETTER: Consider turning this into a GitHub action - help the wider community
# NDK install (unzipping) is really noisy - silence the log spam with grep, while keeping errors
- name: Install NDK (silent)
run: .github/scripts/install_ndk.sh 22.0.7026061
run: .github/scripts/install_ndk.sh 24.0.8215888

- name: Update Gradle Wrapper
uses: gradle-update/update-gradle-wrapper-action@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
Write-Host "NDK Install Started"
Write-Host "ANDROID_HOME - $Env:ANDROID_HOME"
Write-Host "ANDROID_SDK_ROOT - $Env:ANDROID_SDK_ROOT"
(. sdkmanager.bat --install "ndk;22.0.7026061" --sdk_root="$Env:ANDROID_SDK_ROOT") | out-null
(. sdkmanager.bat --install "ndk;24.0.8215888" --sdk_root="$Env:ANDROID_SDK_ROOT") | out-null
Write-Host "NDK Install Completed"
# bzip2-sys does not build when the value of CC_armv7-linux-androideabi contains a space
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_pure_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
if: matrix.os == 'windows-latest'
run: |
Write-Host "NDK Install Started"
(. sdkmanager.bat --install "ndk;22.0.7026061" --sdk_root="$Env:ANDROID_SDK_ROOT") | out-null
(. sdkmanager.bat --install "ndk;24.0.8215888" --sdk_root="$Env:ANDROID_SDK_ROOT") | out-null
Write-Host "NDK Install Completed"
- name: Install Rust
Expand Down
4 changes: 2 additions & 2 deletions docs/ENVIRONMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ For example:
```groovy
compileSdkVersion 30
buildToolsVersion "30.0.1"
ndkVersion "22.0.7026061" // Used by GitHub actions - avoids an install step on some machines
ndkVersion "24.0.8215888" // Used by GitHub actions - avoids an install step on some machines
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -50,7 +50,7 @@ For example:
That indicates you need:

- SDK 30 installed (compileSdkVersion and targetSdkVersion)
- NDK 22.0.7026062 (ndkVersion)
- NDK 24.0.8215888 (ndkVersion)
- Build Tools 30.0.1 (buildToolsVersion)

You should open Android Studio and use the Tools --> SDK Manager to download them
Expand Down
2 changes: 1 addition & 1 deletion rsdroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def getAnkiCommitHash = { ->

android {
compileSdkVersion rootProject.ext.compileSdkVersion
ndkVersion "22.0.7026061" // Used by GitHub actions - avoids an install step on some machines
ndkVersion "24.0.8215888" // Used by GitHub actions - avoids an install step on some machines

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
2 changes: 1 addition & 1 deletion tools/doctor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e # Error out if there were any problems

ANDROID_NDK_VERSION="22.0.7026061"
ANDROID_NDK_VERSION="24.0.8215888"

red=31
green=32
Expand Down

0 comments on commit 506ea4b

Please sign in to comment.