Skip to content

Commit 4cd537a

Browse files
dimskomDima
andauthored
reverting NDK from 29.0.13599879 to latest NDK LTS version (#1369)
Co-authored-by: Dima <dskomarovsky@microsoft.com>
1 parent ce7a910 commit 4cd537a

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

.github/workflows/build-android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
java -version
4747
gci env:* | sort-object name
4848
new-item "C:\Users\runneradmin\.android\repositories.cfg" -ItemType "file"
49-
echo yes | .\sdkmanager.bat "ndk-bundle" "cmake;3.10.2.4988404" "ndk;29.0.13599879" --sdk_root=$Env:ANDROID_SDK_ROOT
49+
echo yes | .\sdkmanager.bat "ndk-bundle" "cmake;3.10.2.4988404" "ndk;27.0.12077973" --sdk_root=$Env:ANDROID_SDK_ROOT
5050
working-directory: ${{ env.ANDROID_SDK_ROOT }}\cmdline-tools\7.0\bin
5151
- name: Chocolatey
5252
run: |

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
java -version
116116
gci env:* | sort-object name
117117
new-item "C:\Users\runneradmin\.android\repositories.cfg" -ItemType "file"
118-
echo yes | .\sdkmanager.bat "ndk-bundle" "cmake;3.10.2.4988404" "ndk;29.0.13599879" --sdk_root=$Env:ANDROID_SDK_ROOT
118+
echo yes | .\sdkmanager.bat "ndk-bundle" "cmake;3.10.2.4988404" "ndk;27.0.12077973" --sdk_root=$Env:ANDROID_SDK_ROOT
119119
working-directory: ${{ env.ANDROID_SDK_ROOT }}\cmdline-tools\7.0\bin
120120
- name: Chocolatey
121121
run: |

build-android.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pushd "%~dp0"
44
REM Users may override the default %ANDROID_SDK_ROOT% location if necessary
55

66
if "%ANDROID_SDK_ROOT%" == "" set "ANDROID_SDK_ROOT=C:\Android\android-sdk"
7-
if "%ANDROID_NDK_VERSION%" == "" set "ANDROID_NDK_VERSION=29.0.13599879"
7+
if "%ANDROID_NDK_VERSION%" == "" set "ANDROID_NDK_VERSION=27.0.12077973"
88
if "%ANDROID_CMAKE_VERSION%" == "" set "ANDROID_CMAKE_VERSION=3.10.2.4988404"
99
if "%ANDROID_HOME%" == "" set "ANDROID_HOME=%ANDROID_SDK_ROOT%"
1010
if "%ANDROID_NDK%" == "" set "ANDROID_NDK=%ANDROID_SDK_ROOT%\ndk\%ANDROID_NDK_VERSION%"

docs/cpp-start-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Default environment variables used by `build-android.cmd` script:
2222

2323
```console
2424

25-
set "ANDROID_NDK_VERSION=29.0.13599879"
25+
set "ANDROID_NDK_VERSION=27.0.12077973"
2626
set "ANDROID_CMAKE_VERSION=3.10.2.4988404"
2727
set "ANDROID_SDK_ROOT=C:\Android\android-sdk"
2828
set "ANDROID_HOME=%ANDROID_SDK_ROOT%"

lib/android_build/ide.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set "PATH=%AndroidStudioPath%\bin;%PATH%"
99

1010
if "%ANDROID_SDK_ROOT%" == "" set "ANDROID_SDK_ROOT=C:\Android\android-sdk"
1111
if "%ANDROID_HOME%" == "" set "ANDROID_HOME=%ANDROID_SDK_ROOT%"
12-
if "%ANDROID_NDK_VERSION%"== "" set "ANDROID_NDK_VERSION=29.0.13599879"
12+
if "%ANDROID_NDK_VERSION%"== "" set "ANDROID_NDK_VERSION=27.0.12077973"
1313
if "%ANDROID_NDK%" == "" set "ANDROID_NDK=%ANDROID_SDK_ROOT%\ndk\%ANDROID_NDK_VERSION%"
1414
if "%ANDROID_NDK_HOME%" == "" set "ANDROID_NDK_HOME=%ANDROID_NDK%"
1515

lib/android_build/tools.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ android {
22

33
compileSdkVersion = 32
44

5-
ndkVersion = System.getenv("ANDROID_NDK_VERSION") ?: "29.0.13599879"
5+
ndkVersion = System.getenv("ANDROID_NDK_VERSION") ?: "27.0.12077973"
66

77
defaultConfig {
88
minSdkVersion 19

0 commit comments

Comments
 (0)