Skip to content

Commit

Permalink
Merge pull request #163 from OpenBrickProtocolFoundation/update-ndk-v…
Browse files Browse the repository at this point in the history
…ersion

Update ndk version
  • Loading branch information
Totto16 committed Jun 7, 2024
2 parents b2271fa + 09478fe commit 1fb575a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

- name: Setup NDK
run: |
sdkmanager --install "ndk;27.0.11718014"
sdkmanager --install "ndk;27.0.11902837"
- name: Build native libraries
Expand Down
2 changes: 1 addition & 1 deletion platforms/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ android {
}

compileSdkVersion 34
ndkVersion "27.0.11718014-rc1"
ndkVersion "27.0.11902837-rc1"
defaultConfig {
if (buildAsApplication) {
applicationId "com.github.oopetris"
Expand Down
6 changes: 5 additions & 1 deletion platforms/android/app/jni/Application.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ APP_STL := c++_shared
APP_ABI := armeabi-v7a arm64-v8a x86 x86_64

# used SDK number
APP_PLATFORM=android-34
APP_PLATFORM := android-34

# support 16KB page sizes:
# see: https://developer.android.com/guide/practices/page-sizes
APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true
4 changes: 2 additions & 2 deletions platforms/build-android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ set -e

mkdir -p toolchains

export NDK_VER_DOWNLOAD="r27-beta1"
export NDK_VER_DESC="r27-beta1"
export NDK_VER_DOWNLOAD="r27-beta2"
export NDK_VER_DESC="r27-beta2"

export BASE_PATH="$PWD/toolchains/android-ndk-$NDK_VER_DESC"
export ANDROID_NDK_HOME="$BASE_PATH"
Expand Down

0 comments on commit 1fb575a

Please sign in to comment.