From bfaf247d30f69fd9beb372fd8b5409ef632daee6 Mon Sep 17 00:00:00 2001 From: Chase Knowlden Date: Tue, 12 Aug 2025 10:45:57 -0400 Subject: [PATCH] Update NDK version to 28 (#13729) * Update NDK version to 28 and add 16kb page size linker flags to x86_64 * Remove Android Linker Options 16kb page size is now the default since NDK r28c * Update Android CI to use NDK 28 (cherry picked from commit 6e422e5ff2a615fefb666e840ddcedc6b345ce95) --- .github/workflows/release.yml | 2 +- build-scripts/build-release.py | 4 +--- build-scripts/release-info.json | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 01eaee96ca..d57fa85026 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -535,7 +535,7 @@ jobs: uses: nttld/setup-ndk@v1 with: local-cache: true - ndk-version: r21e + ndk-version: r28c - name: 'Setup Java JDK' uses: actions/setup-java@v4 with: diff --git a/build-scripts/build-release.py b/build-scripts/build-release.py index b256e4d54c..e25bda8c11 100755 --- a/build-scripts/build-release.py +++ b/build-scripts/build-release.py @@ -542,9 +542,7 @@ class AndroidApiVersion: def __repr__(self) -> str: return f"<{self.name} ({'.'.join(str(v) for v in self.ints)})>" -ANDROID_ABI_EXTRA_LINK_OPTIONS = { - "arm64-v8a": "-Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384", -} +ANDROID_ABI_EXTRA_LINK_OPTIONS = {} class Releaser: def __init__(self, release_info: dict, commit: str, revision: str, root: Path, dist_path: Path, section_printer: SectionPrinter, executer: Executer, cmake_generator: str, deps_path: Path, overwrite: bool, github: bool, fast: bool): diff --git a/build-scripts/release-info.json b/build-scripts/release-info.json index 8ba213ae27..4847751414 100644 --- a/build-scripts/release-info.json +++ b/build-scripts/release-info.json @@ -183,7 +183,7 @@ ], "api-minimum": 21, "api-target": 35, - "ndk-minimum": 21, + "ndk-minimum": 28, "aar-files": { "": [ "android-project/app/proguard-rules.pro:proguard.txt",