From 57bd087cdf416343296bf832092826111afab752 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Mon, 2 Aug 2021 12:53:09 -0700
Subject: [PATCH] buildscripts: Build android instrumentation tests in android
 CI

Binder's :build was missing. Cronet build failed without specifying
Java 8 because of the transitive Guava dependency.
---
 buildscripts/kokoro/android.sh | 2 ++
 cronet/build.gradle            | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/buildscripts/kokoro/android.sh b/buildscripts/kokoro/android.sh
index 50337ef878..3ca4fa88bc 100755
--- a/buildscripts/kokoro/android.sh
+++ b/buildscripts/kokoro/android.sh
@@ -31,6 +31,8 @@ buildscripts/make_dependencies.sh
     :grpc-android-interop-testing:build \
     :grpc-android:build \
     :grpc-cronet:build \
+    :grpc-binder:build \
+    assembleAndroidTest \
     publishToMavenLocal
 
 if [[ ! -z $(git status --porcelain) ]]; then
diff --git a/cronet/build.gradle b/cronet/build.gradle
index 2d73cc4194..7a6d58a7e4 100644
--- a/cronet/build.gradle
+++ b/cronet/build.gradle
@@ -28,6 +28,10 @@ android {
             consumerProguardFiles 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
     testOptions { unitTests { includeAndroidResources = true } }
     lintOptions { disable 'InvalidPackage' }
 }