Skip to content
Open
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 @@ -58,7 +58,7 @@ jobs:
java -version
gci env:* | sort-object name
new-item "$Env:USERPROFILE\.android\repositories.cfg" -ItemType "file"
echo yes | sdkmanager "ndk-bundle" "cmake;3.10.2.4988404" "ndk;27.0.12077973" --sdk_root=$Env:ANDROID_SDK_ROOT
echo yes | sdkmanager "ndk-bundle" "cmake;3.22.1" "ndk;27.0.12077973" --sdk_root=$Env:ANDROID_SDK_ROOT
- name: Chocolatey
run: |
choco install --no-progress -y ninja
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 @@ -118,7 +118,7 @@ jobs:
java -version
gci env:* | sort-object name
new-item "$Env:USERPROFILE\.android\repositories.cfg" -ItemType "file"
echo yes | sdkmanager "ndk-bundle" "cmake;3.10.2.4988404" "ndk;27.0.12077973" --sdk_root=$Env:ANDROID_SDK_ROOT
echo yes | sdkmanager "ndk-bundle" "cmake;3.22.1" "ndk;27.0.12077973" --sdk_root=$Env:ANDROID_SDK_ROOT
- name: Chocolatey
run: |
choco install --no-progress -y ninja
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-android-mac.yml.off
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
with:
api-level: 29
ndk: 21.1.6352462
cmake: 3.10.2.4988404
cmake: 3.22.1
working-directory: ./lib/android_build
script: ./testandlog
- name: Upload
Expand Down
2 changes: 1 addition & 1 deletion build-android.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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=27.0.12077973"
if "%ANDROID_CMAKE_VERSION%" == "" set "ANDROID_CMAKE_VERSION=3.10.2.4988404"
if "%ANDROID_CMAKE_VERSION%" == "" set "ANDROID_CMAKE_VERSION=3.22.1"
if "%ANDROID_HOME%" == "" set "ANDROID_HOME=%ANDROID_SDK_ROOT%"
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 docs/cpp-start-android.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Default environment variables used by `build-android.cmd` script:
```console

set "ANDROID_NDK_VERSION=27.0.12077973"
set "ANDROID_CMAKE_VERSION=3.10.2.4988404"
set "ANDROID_CMAKE_VERSION=3.22.1"
set "ANDROID_SDK_ROOT=C:\Android\android-sdk"
set "ANDROID_HOME=%ANDROID_SDK_ROOT%"
set "ANDROID_NDK=%ANDROID_SDK_ROOT%\ndk\%ANDROID_NDK_VERSION%"
Expand Down
2 changes: 1 addition & 1 deletion lib/android_build/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ android {
externalNativeBuild {
cmake {
path "src/main/cpp/CMakeLists.txt"
version "3.10.2"
version "3.22.1"
}
}
compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion lib/android_build/maesdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ android {
externalNativeBuild {
cmake {
path "src/main/cpp/CMakeLists.txt"
version "3.10.2"
version "3.22.1"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions tools/build-android-aar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set -euo pipefail
# - Requires ANDROID_SDK_ROOT (or ANDROID_HOME) when installing NDK.

ANDROID_NDK_VERSION_DEFAULT="27.0.12077973"
CMAKE_VERSION_DEFAULT="3.10.2.4988404"
CMAKE_VERSION_DEFAULT="3.22.1"

INSTALL_NDK=0
CLEAN=0
Expand All @@ -29,7 +29,7 @@ Build MAESDK Android AAR locally.
Options:
--install-ndk Install the pinned NDK + CMake via sdkmanager.
--ndk-version <version> Override NDK version (default: 27.0.12077973).
--cmake-version <version> Override CMake version (default: 3.10.2.4988404).
--cmake-version <version> Override CMake version (default: 3.22.1).
--output-dir <path> Output directory (default: <repo>/dist/android-aar).
--clean Run a clean build (gradle clean).
-h, --help Show help.
Expand Down
Loading