2
0
Эх сурвалжийг харах

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)
Chase Knowlden 1 сар өмнө
parent
commit
bfaf247d30

+ 1 - 1
.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:

+ 1 - 3
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):

+ 1 - 1
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",