Update NDK to 26.1 . Raise minSdk to 21 (because of NDK)

opendocument-app · Jan 1, 2024 · b502e9c · b502e9c
1 parent b8b20f8
commit b502e9c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -123,10 +123,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Oldest API supported by NDK
-          - arch: x86
-            api-level: 16
-            api-type-target: default
           # Oldest x86_64 image
           - arch: x86_64
             api-level: 21

diff --git a/.github/workflows/unprivilegedBuild.yml b/.github/workflows/unprivilegedBuild.yml
@@ -103,10 +103,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Oldest API supported by NDK
-          - arch: x86
-            api-level: 16
-            api-type-target: default
           # Oldest x86_64 image
           - arch: x86_64
             api-level: 21

diff --git a/README.md b/README.md
@@ -38,5 +38,5 @@ Library needs Android Context to obtain path to cache directory and asset files,
 
 ### C++ runtime dependency:
 [Using mismatched prebuilt libraries](https://developer.android.com/ndk/guides/common-problems#using_mismatched_prebuilt_libraries) is less problematic if all the libraries used in the application are:
-* Built with the same toolchain - ndk-23.2.8568313
+* Built with the same toolchain - ndk-26.1.10909125
 * Linked against shared C++ STL - `android.defaultConfig.externalNativeBuild.cmake.arguments "-DANDROID_STL=c++_shared"` in app's (and all JNI dependencies) build.gradle.
diff --git a/dependency-builder/build.gradle b/dependency-builder/build.gradle
@@ -24,7 +24,7 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 33
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 33
         ndk.abiFilters = project.hasProperty('abi') ? [project.property('abi')] : ["arm64-v8a", "armeabi-v7a", "x86", "x86_64"]
         externalNativeBuild.cmake.arguments '-DANDROID_STL=c++_shared'
@@ -34,7 +34,7 @@ android {
         path "src/main/cpp/CMakeLists.txt"
         version "3.22.1"
     }
-    ndkVersion '23.2.8568313'
+    ndkVersion '26.1.10909125'
 }
 
 // Issue #1 (from pdf2htmlEX-Android)

diff --git a/doChangeNDK b/doChangeNDK
@@ -4,9 +4,7 @@ set -eu
 THIS_FILE=$(readlink -f "$0")
 BASEDIR=$(dirname "$THIS_FILE")
 
-# NDK-23 is the last to support api-16
-NDK="23.2.8568313"
-#NDK="25.0.8775105"
+NDK="26.1.10909125"
 
 version_format='([0-9\.]+)'
 

diff --git a/wvWare/build.gradle b/wvWare/build.gradle
@@ -40,7 +40,7 @@ afterEvaluate {
 android {
     compileSdkVersion 33
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 33
 
         versionCode 223
@@ -67,7 +67,7 @@ android {
         path "src/main/cpp/CMakeLists.txt"
         version "3.22.1"
     }
-    ndkVersion '23.2.8568313'
+    ndkVersion '26.1.10909125'
     buildTypes {
         release.externalNativeBuild.cmake.arguments '-DCMAKE_BUILD_TYPE=MinSizeRel', "-DINSTALLED_PREFIX=${gatherReleaseArtifactsTask.installed.get()}"
         debug.externalNativeBuild.cmake.arguments "-DINSTALLED_PREFIX=${gatherDebugArtifactsTask.installed.get()}"