Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to NDK r26d #5578

Merged
merged 4 commits into from
Aug 25, 2024
Merged

Switch to NDK r26d #5578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a61c0a
Bump burrunan/gradle-cache-action from 1 to 2
dependabot[bot] Aug 19, 2024
71263e4
Update android.yml
mohsenD98 Aug 22, 2024
70a9a51
More NDK r26d / DRY
m-kuhn Aug 23, 2024
a73b01d
Bump minimum Android version to 23 (Android 6)
mohsenD98 Aug 22, 2024
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
6 changes: 3 additions & 3 deletions .docker/android_dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
13 changes: 7 additions & 6 deletions .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions cmake/Platform.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
1 change: 1 addition & 0 deletions vcpkg/triplets/arm-android.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions vcpkg/triplets/arm-neon-android.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions vcpkg/triplets/arm64-android.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions vcpkg/triplets/x64-android.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions vcpkg/triplets/x86-android.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading