Upgrade NDK to 26.1 to match major versions with pdf2htmlEX and wvWare

ViliusSutkus89 · ViliusSutkus89 · commit 7327f3f09622 · 2024-01-03T09:05:43.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.google.firebase.crashlytics'
 
 android {
     compileSdkVersion 33
-    ndkVersion "25.2.9519653"
+    ndkVersion "26.1.10909125"
 
     defaultConfig {
         applicationId "at.tomtasche.reader"
@@ -86,7 +86,11 @@ android {
     }
     packagingOptions {
         jniLibs {
-            pickFirsts += ['lib/armeabi-v7a/libc++_shared.so', 'lib/arm64-v8a/libc++_shared.so', 'lib/x86/libc++_shared.so', 'lib/x86_64/libc++_shared.so']
+            // No need to pickFirst libc++_shared.so if all files are identical.
+            // They will be identical if NDK major version matches.
+            // NDK runtime problems may occur if NDK version mismatches,
+            // so comment this out, to get a compile error instead
+            // pickFirsts += ['**/libc++_shared.so']
         }
     }
     namespace 'at.tomtasche.reader'

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ apply plugin: 'com.google.firebase.crashlytics'`
`4`	`4`
`5`	`5`	`android {`
`6`	`6`	`compileSdkVersion 33`
`7`		`- ndkVersion "25.2.9519653"`
	`7`	`+ ndkVersion "26.1.10909125"`
`8`	`8`
`9`	`9`	`defaultConfig {`
`10`	`10`	`applicationId "at.tomtasche.reader"`
`@@ -86,7 +86,11 @@ android {`
`86`	`86`	`}`
`87`	`87`	`packagingOptions {`
`88`	`88`	`jniLibs {`
`89`		`- pickFirsts += ['lib/armeabi-v7a/libc++_shared.so', 'lib/arm64-v8a/libc++_shared.so', 'lib/x86/libc++_shared.so', 'lib/x86_64/libc++_shared.so']`
	`89`	`+ // No need to pickFirst libc++_shared.so if all files are identical.`
	`90`	`+ // They will be identical if NDK major version matches.`
	`91`	`+ // NDK runtime problems may occur if NDK version mismatches,`
	`92`	`+ // so comment this out, to get a compile error instead`
	`93`	`+ // pickFirsts += ['**/libc++_shared.so']`
`90`	`94`	`}`
`91`	`95`	`}`
`92`	`96`	`namespace 'at.tomtasche.reader'`