From 46dbac3eb63988e6a3e930fe6d85e14ec0e69bee Mon Sep 17 00:00:00 2001
From: John Cormie <jdcormie@google.com>
Date: Wed, 22 Sep 2021 18:53:16 +0000
Subject: [PATCH] Make manifest usable with android_instrumentation_test()s in
 google3 (#8545)

---
 binder/src/androidTest/AndroidManifest.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/binder/src/androidTest/AndroidManifest.xml b/binder/src/androidTest/AndroidManifest.xml
index da2cdcb75e..f53575029d 100644
--- a/binder/src/androidTest/AndroidManifest.xml
+++ b/binder/src/androidTest/AndroidManifest.xml
@@ -1,8 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.grpc.binder">
 
-    <application>
-      <service android:name="io.grpc.binder.HostServices$HostService1"/>
-      <service android:name="io.grpc.binder.HostServices$HostService2"/>
-    </application>
+  <instrumentation
+      android:name="androidx.test.runner.AndroidJUnitRunner"
+      android:targetPackage="io.grpc.binder" />
+
+  <application android:debuggable="true">
+    <uses-library android:name="android.test.runner" />
+
+    <service android:name="io.grpc.binder.HostServices$HostService1" />
+    <service android:name="io.grpc.binder.HostServices$HostService2" />
+  </application>
 </manifest>