Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
java -version
gci env:* | sort-object name
new-item "C:\Users\runneradmin\.android\repositories.cfg" -ItemType "file"
echo yes | .\sdkmanager.bat "ndk-bundle" "cmake;3.10.2.4988404" "ndk;29.0.13599879" --sdk_root=$Env:ANDROID_SDK_ROOT
echo yes | .\sdkmanager.bat "ndk-bundle" "cmake;3.10.2.4988404" "ndk;27.0.12077973" --sdk_root=$Env:ANDROID_SDK_ROOT
working-directory: ${{ env.ANDROID_SDK_ROOT }}\cmdline-tools\7.0\bin
- name: Chocolatey
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
java -version
gci env:* | sort-object name
new-item "C:\Users\runneradmin\.android\repositories.cfg" -ItemType "file"
echo yes | .\sdkmanager.bat "ndk-bundle" "cmake;3.10.2.4988404" "ndk;29.0.13599879" --sdk_root=$Env:ANDROID_SDK_ROOT
echo yes | .\sdkmanager.bat "ndk-bundle" "cmake;3.10.2.4988404" "ndk;27.0.12077973" --sdk_root=$Env:ANDROID_SDK_ROOT
working-directory: ${{ env.ANDROID_SDK_ROOT }}\cmdline-tools\7.0\bin
- name: Chocolatey
run: |
Expand Down
2 changes: 1 addition & 1 deletion build-android.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pushd "%~dp0"
REM Users may override the default %ANDROID_SDK_ROOT% location if necessary

if "%ANDROID_SDK_ROOT%" == "" set "ANDROID_SDK_ROOT=C:\Android\android-sdk"
if "%ANDROID_NDK_VERSION%" == "" set "ANDROID_NDK_VERSION=29.0.13599879"
if "%ANDROID_NDK_VERSION%" == "" set "ANDROID_NDK_VERSION=27.0.12077973"
if "%ANDROID_CMAKE_VERSION%" == "" set "ANDROID_CMAKE_VERSION=3.10.2.4988404"
if "%ANDROID_HOME%" == "" set "ANDROID_HOME=%ANDROID_SDK_ROOT%"
if "%ANDROID_NDK%" == "" set "ANDROID_NDK=%ANDROID_SDK_ROOT%\ndk\%ANDROID_NDK_VERSION%"
Expand Down
2 changes: 1 addition & 1 deletion docs/cpp-start-android.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Default environment variables used by `build-android.cmd` script:

```console

set "ANDROID_NDK_VERSION=29.0.13599879"
set "ANDROID_NDK_VERSION=27.0.12077973"
set "ANDROID_CMAKE_VERSION=3.10.2.4988404"
set "ANDROID_SDK_ROOT=C:\Android\android-sdk"
set "ANDROID_HOME=%ANDROID_SDK_ROOT%"
Expand Down
2 changes: 1 addition & 1 deletion lib/android_build/ide.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set "PATH=%AndroidStudioPath%\bin;%PATH%"

if "%ANDROID_SDK_ROOT%" == "" set "ANDROID_SDK_ROOT=C:\Android\android-sdk"
if "%ANDROID_HOME%" == "" set "ANDROID_HOME=%ANDROID_SDK_ROOT%"
if "%ANDROID_NDK_VERSION%"== "" set "ANDROID_NDK_VERSION=29.0.13599879"
if "%ANDROID_NDK_VERSION%"== "" set "ANDROID_NDK_VERSION=27.0.12077973"
if "%ANDROID_NDK%" == "" set "ANDROID_NDK=%ANDROID_SDK_ROOT%\ndk\%ANDROID_NDK_VERSION%"
if "%ANDROID_NDK_HOME%" == "" set "ANDROID_NDK_HOME=%ANDROID_NDK%"

Expand Down
2 changes: 1 addition & 1 deletion lib/android_build/tools.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ android {

compileSdkVersion = 32

ndkVersion = System.getenv("ANDROID_NDK_VERSION") ?: "29.0.13599879"
ndkVersion = System.getenv("ANDROID_NDK_VERSION") ?: "27.0.12077973"

defaultConfig {
minSdkVersion 19
Expand Down
Loading