From 797518285669fb12657a441e7fd1811a3fbd048d Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Fri, 29 Oct 2021 01:30:01 +0100
Subject: [PATCH] Make package in test manifest consistent

PiperOrigin-RevId: 406255369
---
 extensions/cronet/src/androidTest/AndroidManifest.xml | 4 ++--
 extensions/cronet/src/test/AndroidManifest.xml        | 2 +-
 extensions/ffmpeg/src/test/AndroidManifest.xml        | 2 +-
 extensions/flac/src/test/AndroidManifest.xml          | 2 +-
 extensions/opus/src/test/AndroidManifest.xml          | 2 +-
 extensions/rtmp/src/test/AndroidManifest.xml          | 2 +-
 extensions/vp9/src/test/AndroidManifest.xml           | 2 +-
 library/common/src/test/AndroidManifest.xml           | 2 +-
 library/datasource/src/test/AndroidManifest.xml       | 2 +-
 library/decoder/src/test/AndroidManifest.xml          | 2 +-
 playbacktests/src/androidTest/AndroidManifest.xml     | 4 ++--
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/extensions/cronet/src/androidTest/AndroidManifest.xml b/extensions/cronet/src/androidTest/AndroidManifest.xml
index 96e8e54f57..5ce815adae 100644
--- a/extensions/cronet/src/androidTest/AndroidManifest.xml
+++ b/extensions/cronet/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.android.exoplayer2.ext.cronet">
+    package="com.google.android.exoplayer2.ext.cronet.test">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -28,7 +28,7 @@
     tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 
   <instrumentation
-      android:targetPackage="com.google.android.exoplayer2.ext.cronet"
+      android:targetPackage="com.google.android.exoplayer2.ext.cronet.test"
       android:name="androidx.test.runner.AndroidJUnitRunner"/>
 
 </manifest>
diff --git a/extensions/cronet/src/test/AndroidManifest.xml b/extensions/cronet/src/test/AndroidManifest.xml
index d6e09107a7..ea3f510328 100644
--- a/extensions/cronet/src/test/AndroidManifest.xml
+++ b/extensions/cronet/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer2.ext.cronet">
+<manifest package="com.google.android.exoplayer2.ext.cronet.test">
   <uses-sdk/>
 </manifest>
diff --git a/extensions/ffmpeg/src/test/AndroidManifest.xml b/extensions/ffmpeg/src/test/AndroidManifest.xml
index 6ec1cea289..cb214bc41a 100644
--- a/extensions/ffmpeg/src/test/AndroidManifest.xml
+++ b/extensions/ffmpeg/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer2.ext.ffmpeg">
+<manifest package="com.google.android.exoplayer2.ext.ffmpeg.test">
   <uses-sdk/>
 </manifest>
diff --git a/extensions/flac/src/test/AndroidManifest.xml b/extensions/flac/src/test/AndroidManifest.xml
index 509151aa21..362e3986e3 100644
--- a/extensions/flac/src/test/AndroidManifest.xml
+++ b/extensions/flac/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer2.ext.flac">
+<manifest package="com.google.android.exoplayer2.ext.flac.test">
   <uses-sdk/>
 </manifest>
diff --git a/extensions/opus/src/test/AndroidManifest.xml b/extensions/opus/src/test/AndroidManifest.xml
index d17f889d17..b015221785 100644
--- a/extensions/opus/src/test/AndroidManifest.xml
+++ b/extensions/opus/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer2.ext.opus">
+<manifest package="com.google.android.exoplayer2.ext.opus.test">
   <uses-sdk/>
 </manifest>
diff --git a/extensions/rtmp/src/test/AndroidManifest.xml b/extensions/rtmp/src/test/AndroidManifest.xml
index b2e19827d9..ff41eda581 100644
--- a/extensions/rtmp/src/test/AndroidManifest.xml
+++ b/extensions/rtmp/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer2.ext.rtmp">
+<manifest package="com.google.android.exoplayer2.ext.rtmp.test">
   <uses-sdk/>
 </manifest>
diff --git a/extensions/vp9/src/test/AndroidManifest.xml b/extensions/vp9/src/test/AndroidManifest.xml
index 851213e653..08c7e6b6ee 100644
--- a/extensions/vp9/src/test/AndroidManifest.xml
+++ b/extensions/vp9/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer2.ext.vp9">
+<manifest package="com.google.android.exoplayer2.ext.vp9.test">
   <uses-sdk/>
 </manifest>
diff --git a/library/common/src/test/AndroidManifest.xml b/library/common/src/test/AndroidManifest.xml
index 46c19f53c9..a90b358a73 100644
--- a/library/common/src/test/AndroidManifest.xml
+++ b/library/common/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer2.common">
+<manifest package="com.google.android.exoplayer2.common.test">
   <uses-sdk/>
 </manifest>
diff --git a/library/datasource/src/test/AndroidManifest.xml b/library/datasource/src/test/AndroidManifest.xml
index 173af4332e..869326cce0 100644
--- a/library/datasource/src/test/AndroidManifest.xml
+++ b/library/datasource/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer2.upstream">
+<manifest package="com.google.android.exoplayer2.upstream.test">
   <uses-sdk/>
 </manifest>
diff --git a/library/decoder/src/test/AndroidManifest.xml b/library/decoder/src/test/AndroidManifest.xml
index 66cfd433a3..bcb61fbc63 100644
--- a/library/decoder/src/test/AndroidManifest.xml
+++ b/library/decoder/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer2.decoder">
+<manifest package="com.google.android.exoplayer2.decoder.test">
   <uses-sdk/>
 </manifest>
diff --git a/playbacktests/src/androidTest/AndroidManifest.xml b/playbacktests/src/androidTest/AndroidManifest.xml
index 2c2099496a..5f9b5429f9 100644
--- a/playbacktests/src/androidTest/AndroidManifest.xml
+++ b/playbacktests/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.android.exoplayer2.playbacktests">
+    package="com.google.android.exoplayer2.playbacktests.test">
 
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
@@ -32,7 +32,7 @@
   </application>
 
   <instrumentation
-      android:targetPackage="com.google.android.exoplayer2.playbacktests"
+      android:targetPackage="com.google.android.exoplayer2.playbacktests.test"
       android:name="androidx.test.runner.AndroidJUnitRunner"/>
 
 </manifest>