Skip to content

Commit

Permalink
ndk v28.0 rc2
Browse files Browse the repository at this point in the history
  • Loading branch information
korejan committed Nov 23, 2024
1 parent 5abaaeb commit 0767864
Show file tree
Hide file tree
Showing 9 changed files with 119 additions and 119 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/prepare-alxr-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ jobs:
needs: [prepare_release]
env:
RUST_BACKTRACE: 1
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/27.2.12479018
ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/27.2.12479018
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/28.0.12674087
ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/28.0.12674087
ANDROID_CMAKE_BIN: /usr/local/lib/android/sdk/cmake/3.31.0/bin
JAVA_HOME: $JAVA_HOME_17_X64
steps:
Expand All @@ -333,7 +333,7 @@ jobs:
sudo apt update && sudo apt upgrade -y
sudo apt install gcc-multilib
SDK_MANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager
yes | sudo $SDK_MANAGER --install "ndk;27.2.12479018" "platforms;android-29" "cmake;3.31.0"
yes | sudo $SDK_MANAGER --install "ndk;28.0.12674087" "platforms;android-29" "cmake;3.31.0"
rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android
cargo install cargo-apk --git https://github.com/korejan/cargo-apk.git --branch android-manifest-entries
Expand Down Expand Up @@ -389,8 +389,8 @@ jobs:
needs: [prepare_release]
env:
RUST_BACKTRACE: 1
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/27.2.12479018
ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/27.2.12479018
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/28.0.12674087
ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/28.0.12674087
ANDROID_CMAKE_BIN: /usr/local/lib/android/sdk/cmake/3.31.0/bin
JAVA_HOME: $JAVA_HOME_17_X64
steps:
Expand All @@ -411,7 +411,7 @@ jobs:
sudo apt update && sudo apt upgrade -y
sudo apt install gcc-multilib
SDK_MANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager
yes | sudo $SDK_MANAGER --install "ndk;27.2.12479018" "platforms;android-29" "cmake;3.31.0"
yes | sudo $SDK_MANAGER --install "ndk;28.0.12674087" "platforms;android-29" "cmake;3.31.0"
rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android
cargo install cargo-apk --git https://github.com/korejan/cargo-apk.git --branch android-manifest-entries
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ jobs:
build_alxr_android:
runs-on: ubuntu-22.04
env:
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/27.2.12479018
ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/27.2.12479018
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/28.0.12674087
ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/28.0.12674087
ANDROID_CMAKE_BIN: /usr/local/lib/android/sdk/cmake/3.31.0/bin
RUST_BACKTRACE: 1
steps:
Expand All @@ -227,7 +227,7 @@ jobs:
sudo apt install gcc-multilib
SDK_MANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager
yes | sudo $SDK_MANAGER --install "ndk;27.2.12479018" "platforms;android-29" "cmake;3.31.0"
yes | sudo $SDK_MANAGER --install "ndk;28.0.12674087" "platforms;android-29" "cmake;3.31.0"
rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android
cargo install cargo-apk --git https://github.com/korejan/cargo-apk.git --branch android-manifest-entries
Expand Down
Loading

0 comments on commit 0767864

Please sign in to comment.