fix: exclude ijkplayer exoplayer transitive dep and resolve manifest merger conflict
This commit is contained in:
parent
7d0c0fc4dd
commit
0ac89bb4df
|
|
@ -110,5 +110,7 @@ dependencies {
|
|||
implementation("androidx.media3:media3-ui:$media3Version")
|
||||
|
||||
// HTTP-FLV low-latency playback (IjkPlayer via JitPack)
|
||||
implementation("com.github.andnux:ijkplayer:0.0.1")
|
||||
implementation("com.github.andnux:ijkplayer:0.0.1") {
|
||||
exclude(group = "com.google.android.exoplayer", module = "exoplayer")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
|
|
@ -7,6 +8,7 @@
|
|||
android:allowBackup="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="Live Streaming"
|
||||
tools:replace="android:allowBackup,android:label"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.LiveStreaming"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user