From f444b7bcc01969e27d7cdb78dafdbc750220a4ce Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Tue, 28 Jul 2020 19:40:55 +0000
Subject: [PATCH] android, cronet, android-interop-testing, example/drop
 support for android SDK versions older than 16 (#7253)

---
 android-interop-testing/build.gradle         | 3 +--
 android/build.gradle                         | 7 +++++--
 cronet/build.gradle                          | 5 ++++-
 examples/android/helloworld/app/build.gradle | 3 +--
 examples/android/routeguide/app/build.gradle | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle
index ec144bda19a..0bfc37c4480 100644
--- a/android-interop-testing/build.gradle
+++ b/android-interop-testing/build.gradle
@@ -29,8 +29,7 @@ android {
 
     defaultConfig {
         applicationId "io.grpc.android.integrationtest"
-        // API level 14+ is required for TLS since Google Play Services v10.2
-        minSdkVersion 14
+        minSdkVersion 16
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"
diff --git a/android/build.gradle b/android/build.gradle
index 97f24cd92c1..252b362aca0 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -11,7 +11,7 @@ android {
     compileSdkVersion 28
     defaultConfig {
         consumerProguardFiles "proguard-rules.txt"
-        minSdkVersion 14
+        minSdkVersion 16
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
@@ -31,7 +31,10 @@ dependencies {
     testImplementation project('::grpc-okhttp')
     testImplementation libraries.androidx_test
     testImplementation libraries.junit
-    testImplementation libraries.robolectric
+    testImplementation (libraries.robolectric) {
+        // Unreleased change: https://github.com/robolectric/robolectric/pull/5432
+        exclude group: 'com.google.auto.service', module: 'auto-service'
+    }
     testImplementation libraries.truth
 }
 
diff --git a/cronet/build.gradle b/cronet/build.gradle
index b1b65685bb2..8a57797b638 100644
--- a/cronet/build.gradle
+++ b/cronet/build.gradle
@@ -42,7 +42,10 @@ dependencies {
 
     testImplementation libraries.junit
     testImplementation libraries.mockito
-    testImplementation libraries.robolectric
+    testImplementation (libraries.robolectric) {
+        // Unreleased change: https://github.com/robolectric/robolectric/pull/5432
+        exclude group: 'com.google.auto.service', module: 'auto-service'
+    }
 }
 
 task javadocs(type: Javadoc) {
diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
index e2229f395bc..6f0b4da88a9 100644
--- a/examples/android/helloworld/app/build.gradle
+++ b/examples/android/helloworld/app/build.gradle
@@ -6,8 +6,7 @@ android {
 
     defaultConfig {
         applicationId "io.grpc.helloworldexample"
-        // API level 14+ is required for TLS since Google Play Services v10.2
-        minSdkVersion 14
+        minSdkVersion 16
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle
index 37a18ff858a..3c32ad0f46f 100644
--- a/examples/android/routeguide/app/build.gradle
+++ b/examples/android/routeguide/app/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "io.grpc.routeguideexample"
-        minSdkVersion 14
+        minSdkVersion 16
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"