diff --git a/.docker/android_dev/Dockerfile b/.docker/android_dev/Dockerfile index a7c0a20ad6..379803fdee 100644 --- a/.docker/android_dev/Dockerfile +++ b/.docker/android_dev/Dockerfile @@ -52,8 +52,8 @@ curl -o /android-sdk-10406996.zip https://dl.google.com/android/repository/comma curl -o /android-ndk-r25c-linux.zip https://dl.google.com/android/repository/android-ndk-r25c-linux.zip # Android NDK -unzip /android-ndk-r25c-linux.zip -rm -f android-ndk-r25c-linux.zip +unzip /android-ndk-r26d-linux.zip +rm -f android-ndk-r26d-linux.zip # Android SDK unzip /android-sdk-10406996.zip -d android-sdk @@ -66,7 +66,7 @@ yes | /android-sdk/cmdline-tools/latest/bin/sdkmanager --licenses /android-sdk/cmdline-tools/latest/bin/sdkmanager "platforms;android-34" "build-tools;34.0.0" "platform-tools" "tools" END_OF_SCRIPT -ENV ANDROID_NDK_HOME /android-ndk-r25c +ENV ANDROID_NDK_HOME /android-ndk-r26d ENV ANDROID_SDK_ROOT /android-sdk WORKDIR /usr/src diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index d8346fd79d..c26c4eb062 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -76,13 +76,14 @@ jobs: id: vars shell: bash run: | + NDK_VERSION=26.3.11579264 echo "JAVA_HOME=${JAVA_HOME_17_X64}" >> $GITHUB_ENV - echo "ANDROID_NDK_VERSION=25.2.9519653" >> $GITHUB_ENV - echo "ANDROID_NDK=/usr/local/lib/android/sdk/ndk/25.2.9519653" >> $GITHUB_ENV - echo "ANDROID_NDK_HOME=/usr/local/lib/android/sdk/ndk/25.2.9519653" >> $GITHUB_ENV - echo "ANDROID_NDK_ROOT=/usr/local/lib/android/sdk/ndk/25.2.9519653" >> $GITHUB_ENV echo "ANDROID_BUILD_TOOLS_VERSION=34.0.0" >> $GITHUB_ENV - echo "ndk.dir=/usr/local/lib/android/sdk/ndk/25.2.9519653" >> local.properties + echo "ANDROID_NDK_VERSION=${NDK_VERSION}" >> $GITHUB_ENV + echo "ANDROID_NDK=/usr/local/lib/android/sdk/ndk/${NDK_VERSION}" >> $GITHUB_ENV + echo "ANDROID_NDK_HOME=/usr/local/lib/android/sdk/ndk/${NDK_VERSION}" >> $GITHUB_ENV + echo "ANDROID_NDK_ROOT=/usr/local/lib/android/sdk/ndk/${NDK_VERSION}" >> $GITHUB_ENV + echo "ndk.dir=/usr/local/lib/android/sdk/ndk/${NDK_VERSION}" >> local.properties ALL_FILES_ACCESS=${{ matrix.all_files_access }} ./scripts/ci/env_gh.sh BUILD_ROOT="/home/runner" @@ -173,7 +174,7 @@ jobs: echo "$SIGNINGKEY" | base64 --decode > ./keystore.p12 - name: Cache .gradle - uses: burrunan/gradle-cache-action@v1 + uses: burrunan/gradle-cache-action@v2 - name: Package env: diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index b9614e237e..72d1178879 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -22,7 +22,7 @@ endif() if(ANDROID_ABI) set(ANDROID_BUILD_TOOLS_VERSION "34.0.0" CACHE STRING "Android build-tools version") set(ANDROID_TARGET_PLATFORM 34 CACHE INT "Target Android platform SDK version") - set(ANDROID_PLATFORM 21 CACHE INT "Minimum Android platform SDK version") - set(ANDROID_PLATFORM_INT 21 CACHE INT "Minimum Android platform SDK version") # Used in build.gradle.in + set(ANDROID_PLATFORM 23 CACHE INT "Minimum Android platform SDK version") + set(ANDROID_PLATFORM_INT 23 CACHE INT "Minimum Android platform SDK version") # Used in build.gradle.in set(ANDROID_CPP_FEATURES "rtti exceptions") endif() diff --git a/vcpkg/triplets/arm-android.cmake b/vcpkg/triplets/arm-android.cmake index 47041d0723..779799c532 100644 --- a/vcpkg/triplets/arm-android.cmake +++ b/vcpkg/triplets/arm-android.cmake @@ -12,6 +12,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_BUILD_TYPE release) set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi") set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=OFF) +set(VCPKG_CMAKE_SYSTEM_VERSION 23) set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) set(VCPKG_CXX_FLAGS "-fstack-protector-strong") diff --git a/vcpkg/triplets/arm-neon-android.cmake b/vcpkg/triplets/arm-neon-android.cmake index d9430e83bc..6711290abd 100644 --- a/vcpkg/triplets/arm-neon-android.cmake +++ b/vcpkg/triplets/arm-neon-android.cmake @@ -12,6 +12,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_BUILD_TYPE release) set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi") set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=ON) +set(VCPKG_CMAKE_SYSTEM_VERSION 23) set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) set(VCPKG_CXX_FLAGS "-fstack-protector-strong") diff --git a/vcpkg/triplets/arm64-android.cmake b/vcpkg/triplets/arm64-android.cmake index 6825738d15..3436139b38 100644 --- a/vcpkg/triplets/arm64-android.cmake +++ b/vcpkg/triplets/arm64-android.cmake @@ -12,6 +12,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_BUILD_TYPE release) set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-linux-android") set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=arm64-v8a) +set(VCPKG_CMAKE_SYSTEM_VERSION 23) set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) set(VCPKG_CXX_FLAGS "-fstack-protector-strong") diff --git a/vcpkg/triplets/x64-android.cmake b/vcpkg/triplets/x64-android.cmake index cf9f687c0d..25194128d0 100644 --- a/vcpkg/triplets/x64-android.cmake +++ b/vcpkg/triplets/x64-android.cmake @@ -12,6 +12,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_BUILD_TYPE release) set(VCPKG_MAKE_BUILD_TRIPLET "--host=x86_64-linux-android") set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=x86_64) +set(VCPKG_CMAKE_SYSTEM_VERSION 23) set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) set(VCPKG_CXX_FLAGS "-fstack-protector-strong") diff --git a/vcpkg/triplets/x86-android.cmake b/vcpkg/triplets/x86-android.cmake index 5f806672ea..b305f26f13 100644 --- a/vcpkg/triplets/x86-android.cmake +++ b/vcpkg/triplets/x86-android.cmake @@ -12,6 +12,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_BUILD_TYPE release) set(VCPKG_MAKE_BUILD_TRIPLET "--host=i686-linux-android") set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=x86) +set(VCPKG_CMAKE_SYSTEM_VERSION 23) set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) set(VCPKG_CXX_FLAGS "-fstack-protector-strong")