Update Android NDK from 19 to 28. Support 16 KB page sizes(https://de…

…veloper.android.com/guide/practices/page-sizes#kotlin).
Tencent · Feb 20, 2025 · 7845f7d · 7845f7d
1 parent d51f042
commit 7845f7d
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ features like video templates.
 ## System Requirements
 
 - iOS 9.0 or later
-- Android 4.4 or later
+- Android 5.0 or later
 - HarmonyOS Next 5.0.0(12) or later
 - macOS 10.15 or later
 - Windows 7.0 or later
@@ -215,8 +215,8 @@ versions, you can download the precompiled libraries from [here](https://github.
 - Ninja 1.9.0+
 - CMake 3.13.0+
 - QT 5.13.0+
-- NDK 19.2+ (**19.2.5345600 recommended**)
-- Emscripten 3.1.20+ (**3.1.20 recommended**)
+- NDK 28+ (**28.0.13004108 recommended**)
+- Emscripten 3.1.58+
 
 ### Dependency Management
 

diff --git a/README.zh_CN.md b/README.zh_CN.md
@@ -54,7 +54,7 @@ PAG 方案目前已经接入了腾讯系 40 余款应用，包括微信，手机
 ## 系统要求
 
 - iOS 9.0 版本及以上
-- Android 4.4 版本及以上
+- Android 5.0 版本及以上
 - HarmonyOS Next 5.0.0(12) 版本及以上
 - macOS 10.15 版本及以上
 - Windows 7.0 版本及以上
@@ -204,8 +204,8 @@ Web 端更多接入方式请参考：[Web端接入指南](https://pag.io/docs/sd
 - Ninja 1.9.0+
 - CMake 3.13.0+
 - QT 5.13.0+
-- NDK 19.2+ (**推荐 19.2.5345600 版本**)
-- Emscripten 3.1.20+ (**推荐 3.1.20 版本**)
+- NDK 28+ (**推荐 28.0.13004108 版本**)
+- Emscripten 3.1.58+
 
 ### 依赖管理
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -6,13 +6,11 @@ buildscript {
         supportLibVersion = '28.0.0'
         junitVersion = '4.12'
         compileSdkVersion = 33
-        buildToolsVersion = '33.0.2'
-        ndkVersion = '19.2.5345600'
-        minSdkVersion = 19
+        buildToolsVersion = '35.0.0'
+        ndkVersion = '28.0.13004108'
+        minSdkVersion = 21
         targetSdkVersion = 33
-        // Set the AGP version according to the corresponding Gradle version.
-        // Documentation: https://developer.android.com/build/releases/gradle-plugin#updating-gradle
-        agpVersion = '8.7.3'
+        agpVersion = '8.8.1'
         appcompatVersion = '1.4.2' // after this version, compileSdkVersion must large than 31
     }
     repositories {

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -12,7 +12,7 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4608M
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
+android.buildFeatures.buildConfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 android.native.buildOutput=verbose

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/android/libpag/build.gradle b/android/libpag/build.gradle
@@ -127,42 +127,42 @@ signing {
 project.afterEvaluate {
     mergeReleaseNativeLibs.doLast {
         delete {
-            delete project.getBuildDir().path + '/intermediates/merged_native_libs/release/out/lib/armeabi'
+            delete project.getBuildDir().path + '/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/armeabi'
         }
         copy {
-            from project.getBuildDir().path + '/intermediates/merged_native_libs/release/out/lib/armeabi-v7a'
-            into project.getBuildDir().path + '/intermediates/merged_native_libs/release/out/lib/armeabi'
+            from project.getBuildDir().path + '/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/armeabi-v7a'
+            into project.getBuildDir().path + '/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/armeabi'
             include '*.so'
         }
     }
     stripReleaseDebugSymbols.doLast {
         delete {
-            delete project.getBuildDir().path + '/intermediates/stripped_native_libs/release/out/lib/armeabi'
+            delete project.getBuildDir().path + '/intermediates/stripped_native_libs/release/stripReleaseDebugSymbols/out/lib/armeabi'
         }
         copy {
-            from project.getBuildDir().path + '/intermediates/stripped_native_libs/release/out/lib/armeabi-v7a'
-            into project.getBuildDir().path + '/intermediates/stripped_native_libs/release/out/lib/armeabi'
+            from project.getBuildDir().path + '/intermediates/stripped_native_libs/release/stripReleaseDebugSymbols/out/lib/armeabi-v7a'
+            into project.getBuildDir().path + '/intermediates/stripped_native_libs/release/stripReleaseDebugSymbols/out/lib/armeabi'
             include '*.so'
         }
     }
     // 此处为了方便debug，保留debug版本armeabi的拷贝，方便源码接入时候的调试
     mergeDebugNativeLibs.doLast {
         delete {
-            delete project.getBuildDir().path + '/intermediates/merged_native_libs/debug/out/lib/armeabi'
+            delete project.getBuildDir().path + '/intermediates/merged_native_libs/debug/mergeDebugNativeLibs/out/lib/armeabi'
         }
         copy {
-            from project.getBuildDir().path + '/intermediates/merged_native_libs/debug/out/lib/armeabi-v7a'
-            into project.getBuildDir().path + '/intermediates/merged_native_libs/debug/out/lib/armeabi'
+            from project.getBuildDir().path + '/intermediates/merged_native_libs/debug/mergeDebugNativeLibs/out/lib/armeabi-v7a'
+            into project.getBuildDir().path + '/intermediates/merged_native_libs/debug/mergeDebugNativeLibs/out/lib/armeabi'
             include '*.so'
         }
     }
     stripDebugDebugSymbols.doLast {
         delete {
-            delete project.getBuildDir().path + '/intermediates/stripped_native_libs/debug/out/lib/armeabi'
+            delete project.getBuildDir().path + '/intermediates/stripped_native_libs/debug/stripDebugDebugSymbols/out/lib/armeabi'
         }
         copy {
-            from project.getBuildDir().path + '/intermediates/stripped_native_libs/debug/out/lib/armeabi-v7a'
-            into project.getBuildDir().path + '/intermediates/stripped_native_libs/debug/out/lib/armeabi'
+            from project.getBuildDir().path + '/intermediates/stripped_native_libs/debug/stripDebugDebugSymbols/out/lib/armeabi-v7a'
+            into project.getBuildDir().path + '/intermediates/stripped_native_libs/debug/stripDebugDebugSymbols/out/lib/armeabi'
             include '*.so'
         }
     }

diff --git a/android/libpag/libs/arm64-v8a/libffavc.so b/android/libpag/libs/arm64-v8a/libffavc.so
diff --git a/android/libpag/libs/armeabi-v7a/libffavc.so b/android/libpag/libs/armeabi-v7a/libffavc.so
diff --git a/android/libpag/libs/armeabi/libffavc.so b/android/libpag/libs/armeabi/libffavc.so
diff --git a/android/libpag/libs/x86_64/libffavc.so b/android/libpag/libs/x86_64/libffavc.so
diff --git a/ohos/libpag/README.md b/ohos/libpag/README.md
@@ -105,8 +105,7 @@ versions, you can download the precompiled libraries from [here](https://github.
 - Ninja 1.9.0+
 - CMake 3.13.0+
 - QT 5.13.0+
-- NDK 19.2+ (**19.2.5345600 recommended**)
-- Emscripten 3.1.20+ (**3.1.20 recommended**)
+- Emscripten 3.1.58+
 
 ### Dependency Management