mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 03:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update NDK version to 28 (#13729)

Browse Source 
* 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 6e422e5ff2)
This commit is contained in:
Chase Knowlden
2025-08-12 10:45:57 -04:00
committed by Sam Lantinga
parent 2287c43b59
commit bfaf247d30
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View File

@@ -535,7 +535,7 @@ jobs:
uses: nttld/setup-ndk@v1 uses: nttld/setup-ndk@v1
with: with:
local-cache: true local-cache: true
ndk-version: r21e ndk-version: r28c
- name: 'Setup Java JDK' - name: 'Setup Java JDK'
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:

4
build-scripts/build-release.py
View File

@@ -542,9 +542,7 @@ class AndroidApiVersion:
def __repr__(self) -> str: def __repr__(self) -> str:
return f"<{self.name} ({'.'.join(str(v) for v in self.ints)})>" return f"<{self.name} ({'.'.join(str(v) for v in self.ints)})>"
ANDROID_ABI_EXTRA_LINK_OPTIONS = { ANDROID_ABI_EXTRA_LINK_OPTIONS = {}
"arm64-v8a": "-Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384",
}
class Releaser: 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): 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):

2
build-scripts/release-info.json
View File

@@ -183,7 +183,7 @@
], ],
"api-minimum": 21, "api-minimum": 21,
"api-target": 35, "api-target": 35,
"ndk-minimum": 21, "ndk-minimum": 28,
"aar-files": { "aar-files": {
"": [ "": [
"android-project/app/proguard-rules.pro:proguard.txt", "android-project/app/proguard-rules.pro:proguard.txt",