Skip to content

Commit 6e422e5

Browse files
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
1 parent e699f3d commit 6e422e5

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ jobs:
536536
uses: nttld/setup-ndk@v1
537537
with:
538538
local-cache: true
539-
ndk-version: r21e
539+
ndk-version: r28c
540540
- name: 'Setup Java JDK'
541541
uses: actions/setup-java@v4
542542
with:

build-scripts/build-release.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,7 @@ def __init__(self, name: str, ints: tuple[int, ...]):
542542
def __repr__(self) -> str:
543543
return f"<{self.name} ({'.'.join(str(v) for v in self.ints)})>"
544544

545-
ANDROID_ABI_EXTRA_LINK_OPTIONS = {
546-
"arm64-v8a": "-Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384",
547-
}
545+
ANDROID_ABI_EXTRA_LINK_OPTIONS = {}
548546

549547
class Releaser:
550548
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):

build-scripts/release-info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
],
184184
"api-minimum": 21,
185185
"api-target": 35,
186-
"ndk-minimum": 21,
186+
"ndk-minimum": 28,
187187
"aar-files": {
188188
"": [
189189
"android-project/app/proguard-rules.pro:proguard.txt",

0 commit comments

Comments
 (0)