Skip to content

Commit

Permalink
Update NDK in docs/scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
dae committed Oct 31, 2023
1 parent da9cc41 commit ec48b69
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update_gradle_wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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 25.2.9519653
run: .github/scripts/install_ndk.sh 26.1.10909125

- name: Update Gradle Wrapper
uses: gradle-update/update-gradle-wrapper-action@v1
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ and put it on your path.
In Android Studio, choose the Tools>SDK Manager menu option.

- In SDK tools, enable "show package details"
- Choose NDK version 25.2.9519653.
- Choose NDK version 26.1.10909125.
- After downloading, you may need to restart Android Studio to get it to
synchronize gradle.

Expand Down Expand Up @@ -89,19 +89,19 @@ eg on Linux:

```
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
export ANDROID_NDK_HOME=$HOME/Android/Sdk/ndk/25.2.9519653
export ANDROID_NDK_HOME=$HOME/Android/Sdk/ndk/26.1.10909125
```

Or macOS:

```
export ANDROID_SDK_ROOT=$HOME/Library/Android/sdk
export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk/25.2.9519653
export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk/26.1.10909125
```
Or Windows using Powershell:

```
$env:ANDROID_NDK_HOME="$env:ANDROID_SDK_ROOT\ndk\25.2.9519653"
$env:ANDROID_NDK_HOME="$env:ANDROID_SDK_ROOT\ndk\26.1.10909125"
```
If you don't have Java installed, you may be able to use the version bundled
with Android Studio. Eg on macOS:
Expand Down
2 changes: 1 addition & 1 deletion build-rust.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ task buildRust(type: Exec) {
// ensure script doesn't try to start gradle again
environment 'RUNNING_FROM_GRADLE', '1'
if (!System.getenv('ANDROID_NDK_HOME')) {
String ndkPath = "${getSdkDir()}/ndk/25.2.9519653"
String ndkPath = "${getSdkDir()}/ndk/26.1.10909125"
environment 'ANDROID_NDK_HOME', ndkPath
}
workingDir "$rootDir"
Expand Down
2 changes: 1 addition & 1 deletion rsdroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def getAnkiCommitHash = { ->
android {
namespace 'net.ankiweb.rsdroid'
compileSdk rootProject.ext.compileSdk
ndkVersion "25.2.9519653" // Used by GitHub actions - avoids an install step on some machines
ndkVersion "26.1.10909125" // Used by GitHub actions - avoids an install step on some machines

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
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="25.2.9519653"
ANDROID_NDK_VERSION="26.1.10909125"

red=31
green=32
Expand Down

0 comments on commit ec48b69

Please sign in to comment.