From 0f8ddd5d1a8b0c84aac2e2a969d309e11270e6b7 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Fri, 19 May 2023 16:24:46 +0100
Subject: [PATCH] Suffix package in test `AndroidManifest.xml` files with
 `.test`

This is blocking the upgrade to AGP 8.0.1. The Android Studio Upgrade
Assistant refuses to run with the error:
> Modules have the same package for their `main` and `androidTest`
> artifacts
>
> The package specifications in `AndroidManifest.xml` files define the
> same package for the `main` and `androidTest` artifacts, in the
> following modules: `effect`, `muxer`, `transformer`,
`test_exoplayer_abr`, `test_exoplayer_performance`, and `container`.

This change also adds the `.test` suffix to `test/AndroidManifest.xml`
files where it's missing, because although it's not mentioned in the
Upgrade Assistant error it does cause problems later.

```
> Incorrect package="androidx.media3.database" found in source AndroidManifest.xml: libraries/database/src/test/AndroidManifest.xml.
  Setting the namespace via the package attribute in the source AndroidManifest.xml is no longer supported.
  Recommendation: remove package="androidx.media3.database" from the source AndroidManifest.xml: libraries/database/src/test/AndroidManifest.xml.
```

Issue: androidx/media#409
PiperOrigin-RevId: 533460180
---
 libraries/container/src/androidTest/AndroidManifest.xml   | 4 ++--
 libraries/database/src/test/AndroidManifest.xml           | 2 +-
 libraries/effect/src/androidTest/AndroidManifest.xml      | 4 ++--
 libraries/muxer/src/androidTest/AndroidManifest.xml       | 4 ++--
 libraries/transformer/src/androidTest/AndroidManifest.xml | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/container/src/androidTest/AndroidManifest.xml b/libraries/container/src/androidTest/AndroidManifest.xml
index f6d9eef2e0..4f832693a8 100644
--- a/libraries/container/src/androidTest/AndroidManifest.xml
+++ b/libraries/container/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.container">
+  package="androidx.media3.container.test">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -29,6 +29,6 @@
     android:usesCleartextTraffic="true"/>
 
   <instrumentation
-    android:targetPackage="androidx.media3.container"
+    android:targetPackage="androidx.media3.container.test"
     android:name="androidx.test.runner.AndroidJUnitRunner"/>
 </manifest>
diff --git a/libraries/database/src/test/AndroidManifest.xml b/libraries/database/src/test/AndroidManifest.xml
index 3339898d6c..0759a92294 100644
--- a/libraries/database/src/test/AndroidManifest.xml
+++ b/libraries/database/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="androidx.media3.database">
+<manifest package="androidx.media3.database.test">
   <uses-sdk/>
 </manifest>
diff --git a/libraries/effect/src/androidTest/AndroidManifest.xml b/libraries/effect/src/androidTest/AndroidManifest.xml
index 76bf2cda9b..ccf00cf573 100644
--- a/libraries/effect/src/androidTest/AndroidManifest.xml
+++ b/libraries/effect/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.effect">
+    package="androidx.media3.effect.test">
 
   <uses-sdk/>
 
@@ -26,7 +26,7 @@
       android:usesCleartextTraffic="true"/>
 
   <instrumentation
-      android:targetPackage="androidx.media3.effect"
+      android:targetPackage="androidx.media3.effect.test"
       android:name="androidx.test.runner.AndroidJUnitRunner"/>
 
 </manifest>
diff --git a/libraries/muxer/src/androidTest/AndroidManifest.xml b/libraries/muxer/src/androidTest/AndroidManifest.xml
index b808a041ee..8ed699020b 100644
--- a/libraries/muxer/src/androidTest/AndroidManifest.xml
+++ b/libraries/muxer/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.muxer">
+  package="androidx.media3.muxer.test">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -29,6 +29,6 @@
     android:usesCleartextTraffic="true"/>
 
   <instrumentation
-    android:targetPackage="androidx.media3.muxer"
+    android:targetPackage="androidx.media3.muxer.test"
     android:name="androidx.test.runner.AndroidJUnitRunner"/>
 </manifest>
diff --git a/libraries/transformer/src/androidTest/AndroidManifest.xml b/libraries/transformer/src/androidTest/AndroidManifest.xml
index d665bcf6b9..55d8f57385 100644
--- a/libraries/transformer/src/androidTest/AndroidManifest.xml
+++ b/libraries/transformer/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.transformer">
+    package="androidx.media3.transformer.test">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -30,7 +30,7 @@
       android:usesCleartextTraffic="true"/>
 
   <instrumentation
-      android:targetPackage="androidx.media3.transformer"
+      android:targetPackage="androidx.media3.transformer.test"
       android:name="androidx.test.runner.AndroidJUnitRunner"/>
 
 </manifest>