From 0ac89bb4dfce74770d0b11f85848e30b7ff2df39 Mon Sep 17 00:00:00 2001
From: xiao12feng8 <16507319+xiao12feng8@user.noreply.gitee.com>
Date: Mon, 22 Dec 2025 11:51:35 +0800
Subject: [PATCH] fix: exclude ijkplayer exoplayer transitive dep and resolve
 manifest merger conflict

---
 android-app/app/build.gradle.kts             | 4 +++-
 android-app/app/src/main/AndroidManifest.xml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/android-app/app/build.gradle.kts b/android-app/app/build.gradle.kts
index 58a1001e..e942336f 100644
--- a/android-app/app/build.gradle.kts
+++ b/android-app/app/build.gradle.kts
@@ -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")
+    }
 }
diff --git a/android-app/app/src/main/AndroidManifest.xml b/android-app/app/src/main/AndroidManifest.xml
index d77b2ef8..5a78c08e 100644
--- a/android-app/app/src/main/AndroidManifest.xml
+++ b/android-app/app/src/main/AndroidManifest.xml
@@ -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"