From 7da0bfeee57dc2a36ea6ba21811f4820dc198bba Mon Sep 17 00:00:00 2001 From: csmartdalton Date: Tue, 10 Dec 2024 04:13:23 +0000 Subject: [PATCH] Allow $JAVA_HOME without java installed in deploy_tests.py As long as $JAVA_HOME is defined, gradle doesn't need java to be on the path. Diffs= aaaf1a206e Allow $JAVA_HOME without java installed in deploy_tests.py (#8699) f653f3f73f Support 16kb devices by bumping to NDK r27 (#8558) Co-authored-by: Erik --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- .rive_head | 2 +- app/build.gradle | 2 +- compatibilitytest/build.gradle | 4 ++-- kotlin/build.gradle | 8 ++++++-- kotlin/src/main/cpp/.ndk_version | 2 +- kotlin/src/main/cpp/.ndk_version.bots | 2 +- kotlin/src/main/cpp/build.rive.for.sh | 12 ++++++------ kotlin/src/main/cpp/test/test.sh | 12 ++++++------ submodules/rive-runtime | 2 +- 11 files changed, 31 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9cf5f276..80f0826b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,8 +40,8 @@ jobs: set -x echo "y" | sdkmanager --install 'build-tools;34.0.0' platform-tools --sdk_root=${ANDROID_SDK_ROOT} cd ${ANDROID_HOME} - wget -q https://dl.google.com/android/repository/android-ndk-r25b-linux.zip - unzip -q android-ndk-r25b-linux.zip + wget -q https://dl.google.com/android/repository/android-ndk-r27c-linux.zip + unzip -q android-ndk-r27c-linux.zip echo "y" | sdkmanager --install 'cmake;3.22.1' --channel=0 --sdk_root=${ANDROID_SDK_ROOT} - name: Installing pre-requisites @@ -57,5 +57,5 @@ jobs: env: # ANDROID_SDK_ROOT has been in the env by 'setup-android' above # and is => /usr/local/lib/android/sdk - NDK_PATH: ${{ env.ANDROID_SDK_ROOT }}/android-ndk-r25b + NDK_PATH: ${{ env.ANDROID_SDK_ROOT }}/android-ndk-r27c run: ./gradlew kotlin:assembleRelease diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c0fc557..a950ef47 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,8 +48,8 @@ jobs: set -x echo "y" | sdkmanager --install 'build-tools;34.0.0' platform-tools --sdk_root=${ANDROID_SDK_ROOT} cd ${ANDROID_HOME} - wget -q https://dl.google.com/android/repository/android-ndk-r25b-linux.zip - unzip -q android-ndk-r25b-linux.zip + wget -q https://dl.google.com/android/repository/android-ndk-r27c-linux.zip + unzip -q android-ndk-r27c-linux.zip echo "y" | sdkmanager --install 'cmake;3.22.1' --channel=0 --sdk_root=${ANDROID_SDK_ROOT} - name: Configure venv @@ -109,7 +109,7 @@ jobs: env: # ANDROID_SDK_ROOT has been in the env by 'setup-android' above # and is => /usr/local/lib/android/sdk - NDK_PATH: ${{ env.ANDROID_SDK_ROOT }}/android-ndk-r25b + NDK_PATH: ${{ env.ANDROID_SDK_ROOT }}/android-ndk-r27c run: ./gradlew kotlin:assembleRelease # Runs upload, and then closes & releases the repository diff --git a/.rive_head b/.rive_head index 06c7f263..35d16cfc 100644 --- a/.rive_head +++ b/.rive_head @@ -1 +1 @@ -572265df3bc40447ed8aa36efa2581eb8c2f844d +aaaf1a206eb823a2531952c67adec0184af35aef diff --git a/app/build.gradle b/app/build.gradle index 58cb6cd7..57156e51 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ plugins { android { compileSdk 35 namespace "app.rive.runtime.example" - ndkVersion "25.1.8937393" + ndkVersion "27.2.12479018" defaultConfig { applicationId "app.rive.runtime.example" diff --git a/compatibilitytest/build.gradle b/compatibilitytest/build.gradle index 995b8a0d..031f1d2e 100644 --- a/compatibilitytest/build.gradle +++ b/compatibilitytest/build.gradle @@ -4,9 +4,9 @@ plugins { } android { - compileSdk 35 namespace "app.rive.runtime.compatibilitytest" - ndkVersion "25.1.8937393" + compileSdk 35 + ndkVersion "27.2.12479018" defaultConfig { applicationId "app.rive.runtime.compatibilitytest" diff --git a/kotlin/build.gradle b/kotlin/build.gradle index 84d0a924..ce950906 100644 --- a/kotlin/build.gradle +++ b/kotlin/build.gradle @@ -6,7 +6,7 @@ plugins { android { compileSdk 35 - ndkVersion "25.1.8937393" + ndkVersion "27.2.12479018" namespace "app.rive.runtime.kotlin" defaultConfig { @@ -19,7 +19,11 @@ android { cmake { abiFilters "arm64-v8a", "armeabi-v7a", "x86", "x86_64" arguments "-DCMAKE_VERBOSE_MAKEFILE=1", "-DANDROID_ALLOW_UNDEFINED_SYMBOLS=ON", - "-DANDROID_CPP_FEATURES=no-exceptions no-rtti", "-DANDROID_STL=c++_shared" + "-DANDROID_CPP_FEATURES=no-exceptions no-rtti", "-DANDROID_STL=c++_shared", + // Support for 16kb page sizes, necessary for NDK r27 + // Can remove when upgrading to r28+ + // https://developer.android.com/guide/practices/page-sizes#compile-r27 + "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON" } } } diff --git a/kotlin/src/main/cpp/.ndk_version b/kotlin/src/main/cpp/.ndk_version index 6094064e..ce6e1361 100644 --- a/kotlin/src/main/cpp/.ndk_version +++ b/kotlin/src/main/cpp/.ndk_version @@ -1 +1 @@ -25.1.8937393 +27.2.12479018 diff --git a/kotlin/src/main/cpp/.ndk_version.bots b/kotlin/src/main/cpp/.ndk_version.bots index 065c2ebd..ac88c425 100644 --- a/kotlin/src/main/cpp/.ndk_version.bots +++ b/kotlin/src/main/cpp/.ndk_version.bots @@ -1 +1 @@ -r25b +r27c diff --git a/kotlin/src/main/cpp/build.rive.for.sh b/kotlin/src/main/cpp/build.rive.for.sh index 694e0eb2..3f3e46d1 100755 --- a/kotlin/src/main/cpp/build.rive.for.sh +++ b/kotlin/src/main/cpp/build.rive.for.sh @@ -79,13 +79,13 @@ if [[ -z ${NDK_PATH+x} ]]; then elif [[ ${NDK_PATH} != *${EXPECTED_NDK_VERSION}* ]]; then echo "Wrong NDK version" echo "Expected: /Users//Library/Android/sdk/ndk/${EXPECTED_NDK_VERSION}" - echo " For bot builds, googles NDK distros" - echo " we are currently using: https://github.com/android/ndk/wiki/Unsupported-Downloads, you should be able to get android-ndk-r25b-darwin" + echo " For bot builds, Google's NDK distros," + echo " we are currently using: https://github.com/android/ndk/wiki, you should be able to get android-ndk-r27c-darwin" echo " For human builds" - echo " - open android studio" - echo " - settings search for android sdk, then SDK tools" - echo " - check "show package details" at the bottom" - echo " - select 25.1.8937393 in NDK (Side by Side)" + echo " - Open Android Studio" + echo " - Settings > Search for SDK Tools" + echo " - check "Show Package Details" at the bottom" + echo " - select 27.2.12479018 in NDK (Side by Side)" echo "Found ${NDK_PATH}" exit 1 fi diff --git a/kotlin/src/main/cpp/test/test.sh b/kotlin/src/main/cpp/test/test.sh index 2db21a57..f6e8c44f 100755 --- a/kotlin/src/main/cpp/test/test.sh +++ b/kotlin/src/main/cpp/test/test.sh @@ -28,13 +28,13 @@ if [[ -z ${NDK_PATH+x} ]]; then elif [[ ${NDK_PATH} != *${EXPECTED_NDK_VERSION}* ]]; then echo "Wrong NDK version" echo "Expected: /Users//Library/Android/sdk/ndk/${EXPECTED_NDK_VERSION}" - echo " For bot builds, googles NDK distros" - echo " we are currently using: https://github.com/android/ndk/wiki/Unsupported-Downloads, you should be able to get android-ndk-r25b-darwin" + echo " For bot builds, Google's NDK distros," + echo " we are currently using: https://github.com/android/ndk/wiki, you should be able to get android-ndk-r27c-darwin" echo " For human builds" - echo " - open android studio" - echo " - settings search for android sdk, then SDK tools" - echo " - check "show package details" at the bottom" - echo " - select ${EXPECTED_NDK_VERSION} in NDK (Side by Side)" + echo " - Open Android Studio" + echo " - Settings > Search for SDK Tools" + echo " - check "Show Package Details" at the bottom" + echo " - select 27.2.12479018 in NDK (Side by Side)" echo "Found ${NDK_PATH}" exit 1 fi diff --git a/submodules/rive-runtime b/submodules/rive-runtime index b372618e..c5689245 160000 --- a/submodules/rive-runtime +++ b/submodules/rive-runtime @@ -1 +1 @@ -Subproject commit b372618e03dd2fcd133ef15c01105cc15de75e57 +Subproject commit c56892457502719b0e7ef71fe4efd9e71650ecaa