Support ndkports build with NDK r26b

* Sets minimum SDK version to 21 for all architectures.
* Sets minimum SDK version to 21 for all ports.
* Updates googletest to v1.14.0 (fixes new clang errors).

Test: ./gradlew -PndkPath=ndk-r26b release
Change-Id: Ib4f60eed330f412ffd386b62337c057e79bf5d34

6 files changed, 8 insertions, 8 deletions

diff --git a/buildSrc/src/main/kotlin/com/android/ndkports/Abi.kt b/buildSrc/src/main/kotlin/com/android/ndkports/Abi.kt
index f6dbc01..ce9905a 100644
--- a/buildSrc/src/main/kotlin/com/android/ndkports/Abi.kt
+++ b/buildSrc/src/main/kotlin/com/android/ndkports/Abi.kt
@@ -24,9 +24,9 @@ enum class Abi(
     val triple: String,
     val minSupportedVersion: Int
 ) {
-    Arm("arm", "armeabi-v7a", "arm-linux-androideabi", 19),
+    Arm("arm", "armeabi-v7a", "arm-linux-androideabi", 21),
     Arm64("arm64", "arm64-v8a", "aarch64-linux-android", 21),
-    X86("x86", "x86", "i686-linux-android", 19),
+    X86("x86", "x86", "i686-linux-android", 21),
     X86_64("x86_64", "x86_64", "x86_64-linux-android", 21);
 
     fun adjustMinSdkVersion(minSdkVersion: Int) =
@@ -35,4 +35,4 @@ enum class Abi(
     companion object {
         fun fromAbiName(name: String) = values().find { it.abiName == name }
     }
-}
\ No newline at end of file
+}
diff --git a/curl/build.gradle.kts b/curl/build.gradle.kts
index 8dfa105..9fb1f99 100644
--- a/curl/build.gradle.kts
+++ b/curl/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
 ndkPorts {
     ndkPath.set(File(project.findProperty("ndkPath") as String))
     source.set(project.file("src.tar.gz"))
-    minSdkVersion.set(19)
+    minSdkVersion.set(21)
 }
 
 tasks.prefab {
diff --git a/googletest/build.gradle.kts b/googletest/build.gradle.kts
index b86b9eb..222315d 100644
--- a/googletest/build.gradle.kts
+++ b/googletest/build.gradle.kts
@@ -2,7 +2,7 @@ import com.android.ndkports.AndroidExecutableTestTask
 import com.android.ndkports.CMakeCompatibleVersion
 import com.android.ndkports.CMakePortTask
 
-val portVersion = "1.11.0"
+val portVersion = "1.14.0"
 
 group = "com.android.ndk.thirdparty"
 version = "$portVersion${rootProject.extra.get("snapshotSuffix")}"
@@ -16,7 +16,7 @@ plugins {
 ndkPorts {
     ndkPath.set(File(project.findProperty("ndkPath") as String))
     source.set(project.file("src.tar.gz"))
-    minSdkVersion.set(16)
+    minSdkVersion.set(21)
 }
 
 val buildTask = tasks.register<CMakePortTask>("buildPort") {
diff --git a/googletest/src.tar.gz b/googletest/src.tar.gz
index 8163d74..6ac9efd 100644
--- a/googletest/src.tar.gz
+++ b/googletest/src.tar.gz
diff --git a/jsoncpp/build.gradle.kts b/jsoncpp/build.gradle.kts
index 101bf38..c821427 100644
--- a/jsoncpp/build.gradle.kts
+++ b/jsoncpp/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 ndkPorts {
     ndkPath.set(File(project.findProperty("ndkPath") as String))
     source.set(project.file("src.tar.gz"))
-    minSdkVersion.set(16)
+    minSdkVersion.set(21)
 }
 
 tasks.extractSrc {
diff --git a/openssl/build.gradle.kts b/openssl/build.gradle.kts
index 2052043..aa5ac88 100644
--- a/openssl/build.gradle.kts
+++ b/openssl/build.gradle.kts
@@ -34,7 +34,7 @@ plugins {
 ndkPorts {
     ndkPath.set(File(project.findProperty("ndkPath") as String))
     source.set(project.file("src.tar.gz"))
-    minSdkVersion.set(16)
+    minSdkVersion.set(21)
 }
 
 val buildTask = tasks.register<AdHocPortTask>("buildPort") {