From ccce9948a926c89f2108d78312d6beab63be2db6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 13 Jan 2020 20:25:24 +0000
Subject: [PATCH] Align media2 extension tests with other tests

PiperOrigin-RevId: 289494365
---
 extensions/flac/src/androidTest/AndroidManifest.xml | 4 +---
 extensions/opus/src/androidTest/AndroidManifest.xml | 4 +---
 extensions/vp9/src/androidTest/AndroidManifest.xml  | 4 +---
 library/core/src/androidTest/AndroidManifest.xml    | 1 -
 playbacktests/src/androidTest/AndroidManifest.xml   | 3 ---
 5 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/extensions/flac/src/androidTest/AndroidManifest.xml b/extensions/flac/src/androidTest/AndroidManifest.xml
index 6736ab4b16..9e1133b34d 100644
--- a/extensions/flac/src/androidTest/AndroidManifest.xml
+++ b/extensions/flac/src/androidTest/AndroidManifest.xml
@@ -23,9 +23,7 @@
 
   <application
       android:allowBackup="false"
-      tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
-    <uses-library android:name="android.test.runner"/>
-  </application>
+      tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 
   <instrumentation
       android:targetPackage="com.google.android.exoplayer2.ext.flac.test"
diff --git a/extensions/opus/src/androidTest/AndroidManifest.xml b/extensions/opus/src/androidTest/AndroidManifest.xml
index 7f75cbccea..53ee20a584 100644
--- a/extensions/opus/src/androidTest/AndroidManifest.xml
+++ b/extensions/opus/src/androidTest/AndroidManifest.xml
@@ -23,9 +23,7 @@
 
   <application
       android:allowBackup="false"
-      tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
-    <uses-library android:name="android.test.runner"/>
-  </application>
+      tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 
   <instrumentation
       android:targetPackage="com.google.android.exoplayer2.ext.opus.test"
diff --git a/extensions/vp9/src/androidTest/AndroidManifest.xml b/extensions/vp9/src/androidTest/AndroidManifest.xml
index 4d0832d198..b0d1a88c19 100644
--- a/extensions/vp9/src/androidTest/AndroidManifest.xml
+++ b/extensions/vp9/src/androidTest/AndroidManifest.xml
@@ -23,9 +23,7 @@
 
   <application
       android:allowBackup="false"
-      tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
-    <uses-library android:name="android.test.runner"/>
-  </application>
+      tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 
   <instrumentation
       android:targetPackage="com.google.android.exoplayer2.ext.vp9.test"
diff --git a/library/core/src/androidTest/AndroidManifest.xml b/library/core/src/androidTest/AndroidManifest.xml
index 831ad47831..04a07c4d50 100644
--- a/library/core/src/androidTest/AndroidManifest.xml
+++ b/library/core/src/androidTest/AndroidManifest.xml
@@ -24,7 +24,6 @@
   <application
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
-    <uses-library android:name="android.test.runner"/>
     <provider
       android:authorities="com.google.android.exoplayer2.core.test"
       android:name="com.google.android.exoplayer2.upstream.ContentDataSourceTest$TestContentProvider"/>
diff --git a/playbacktests/src/androidTest/AndroidManifest.xml b/playbacktests/src/androidTest/AndroidManifest.xml
index b6c6064227..2c2099496a 100644
--- a/playbacktests/src/androidTest/AndroidManifest.xml
+++ b/playbacktests/src/androidTest/AndroidManifest.xml
@@ -26,12 +26,9 @@
   <application
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
-    <uses-library android:name="android.test.runner"/>
-
     <activity android:name="com.google.android.exoplayer2.testutil.HostActivity"
         android:configChanges="keyboardHidden|orientation|screenSize"
         android:label="ExoPlayerTest"/>
-
   </application>
 
   <instrumentation