loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Suffix package in test AndroidManifest.xml files with .test

Browse Source 
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
This commit is contained in:
ibaker 2023-05-19 16:24:46 +01:00 committed by Ian Baker
parent fe19dc421d
commit 0f8ddd5d1a
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/container/src/androidTest/AndroidManifest.xml
View File

@ -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>

2
libraries/database/src/test/AndroidManifest.xml
View File

@ -14,6 +14,6 @@
limitations under the License.
-->
<manifest package="androidx.media3.database">
<manifest package="androidx.media3.database.test">
<uses-sdk/>
</manifest>

4
libraries/effect/src/androidTest/AndroidManifest.xml
View File

@ -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>

4
libraries/muxer/src/androidTest/AndroidManifest.xml
View File

@ -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>

4
libraries/transformer/src/androidTest/AndroidManifest.xml
View File

@ -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>