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