From 222db48298a5674700404a0301a27740d08ea5e5 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
---
 libraries/common/src/test/AndroidManifest.xml                 | 2 +-
 libraries/datasource/src/test/AndroidManifest.xml             | 2 +-
 .../datasource_cronet/src/androidTest/AndroidManifest.xml     | 4 ++--
 libraries/datasource_cronet/src/test/AndroidManifest.xml      | 2 +-
 libraries/datasource_rtmp/src/test/AndroidManifest.xml        | 2 +-
 libraries/decoder/src/test/AndroidManifest.xml                | 2 +-
 libraries/decoder_ffmpeg/src/test/AndroidManifest.xml         | 2 +-
 libraries/decoder_flac/src/test/AndroidManifest.xml           | 2 +-
 libraries/decoder_opus/src/test/AndroidManifest.xml           | 2 +-
 libraries/decoder_vp9/src/test/AndroidManifest.xml            | 2 +-
 .../src/androidTest/AndroidManifest.xml                       | 4 ++--
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libraries/common/src/test/AndroidManifest.xml b/libraries/common/src/test/AndroidManifest.xml
index e2890d581f..d034a91143 100644
--- a/libraries/common/src/test/AndroidManifest.xml
+++ b/libraries/common/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="androidx.media3.common">
+<manifest package="androidx.media3.common.test">
   <uses-sdk/>
 </manifest>
diff --git a/libraries/datasource/src/test/AndroidManifest.xml b/libraries/datasource/src/test/AndroidManifest.xml
index aecd4b02cf..0d127f00ce 100644
--- a/libraries/datasource/src/test/AndroidManifest.xml
+++ b/libraries/datasource/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="androidx.media3.datasource">
+<manifest package="androidx.media3.datasource.test">
   <uses-sdk/>
 </manifest>
diff --git a/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml b/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
index 2e0bb16c6c..7da3a987c1 100644
--- a/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
+++ b/libraries/datasource_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="androidx.media3.datasource.cronet">
+    package="androidx.media3.datasource.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="androidx.media3.datasource.cronet"
+      android:targetPackage="androidx.media3.datasource.cronet.test"
       android:name="androidx.test.runner.AndroidJUnitRunner"/>
 
 </manifest>
diff --git a/libraries/datasource_cronet/src/test/AndroidManifest.xml b/libraries/datasource_cronet/src/test/AndroidManifest.xml
index 3b65a2e6c7..eccbd69f0c 100644
--- a/libraries/datasource_cronet/src/test/AndroidManifest.xml
+++ b/libraries/datasource_cronet/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="androidx.media3.datasource.cronet">
+<manifest package="androidx.media3.datasource.cronet.test">
   <uses-sdk/>
 </manifest>
diff --git a/libraries/datasource_rtmp/src/test/AndroidManifest.xml b/libraries/datasource_rtmp/src/test/AndroidManifest.xml
index 10f1025e72..8595e83510 100644
--- a/libraries/datasource_rtmp/src/test/AndroidManifest.xml
+++ b/libraries/datasource_rtmp/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="androidx.media3.datasource.rtmp">
+<manifest package="androidx.media3.datasource.rtmp.test">
   <uses-sdk/>
 </manifest>
diff --git a/libraries/decoder/src/test/AndroidManifest.xml b/libraries/decoder/src/test/AndroidManifest.xml
index bb91780d94..8ab3ba3fff 100644
--- a/libraries/decoder/src/test/AndroidManifest.xml
+++ b/libraries/decoder/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="androidx.media3.decoder">
+<manifest package="androidx.media3.decoder.test">
   <uses-sdk/>
 </manifest>
diff --git a/libraries/decoder_ffmpeg/src/test/AndroidManifest.xml b/libraries/decoder_ffmpeg/src/test/AndroidManifest.xml
index 7cd189e145..6661d8edb9 100644
--- a/libraries/decoder_ffmpeg/src/test/AndroidManifest.xml
+++ b/libraries/decoder_ffmpeg/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="androidx.media3.decoder.ffmpeg">
+<manifest package="androidx.media3.decoder.ffmpeg.test">
   <uses-sdk/>
 </manifest>
diff --git a/libraries/decoder_flac/src/test/AndroidManifest.xml b/libraries/decoder_flac/src/test/AndroidManifest.xml
index 616e48a3cc..7c14498ad4 100644
--- a/libraries/decoder_flac/src/test/AndroidManifest.xml
+++ b/libraries/decoder_flac/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="androidx.media3.decoder.flac">
+<manifest package="androidx.media3.decoder.flac.test">
   <uses-sdk/>
 </manifest>
diff --git a/libraries/decoder_opus/src/test/AndroidManifest.xml b/libraries/decoder_opus/src/test/AndroidManifest.xml
index d4cdb5190d..e5267123cf 100644
--- a/libraries/decoder_opus/src/test/AndroidManifest.xml
+++ b/libraries/decoder_opus/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="androidx.media3.decoder.opus">
+<manifest package="androidx.media3.decoder.opus.test">
   <uses-sdk/>
 </manifest>
diff --git a/libraries/decoder_vp9/src/test/AndroidManifest.xml b/libraries/decoder_vp9/src/test/AndroidManifest.xml
index a525d3bc39..bdd230e6ca 100644
--- a/libraries/decoder_vp9/src/test/AndroidManifest.xml
+++ b/libraries/decoder_vp9/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="androidx.media3.decoder.vp9">
+<manifest package="androidx.media3.decoder.vp9.test">
   <uses-sdk/>
 </manifest>
diff --git a/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml b/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
index d4d171539f..a0d2fd0cfe 100644
--- a/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
+++ b/libraries/test_exoplayer_playback/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="androidx.media3.test.exoplayer.playback">
+    package="androidx.media3.test.exoplayer.playback.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="androidx.media3.test.exoplayer.playback"
+      android:targetPackage="androidx.media3.test.exoplayer.playback.test"
       android:name="androidx.test.runner.AndroidJUnitRunner"/>
 
 </manifest>