From b42dcd675c87b3d04b63602db981965cae4dd3a8 Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Thu, 25 Aug 2022 16:09:00 +0000
Subject: [PATCH] Switch incorrectly configured native multidex to legacy for
 demos

Native multidex can only be used for binaries with minSdkVersion of 21 or higher, but minSdkVersion was specified to 16.

PiperOrigin-RevId: 470004102
(cherry picked from commit d260b0c2a008c4ff9b3763f32feb87b353fc23f2)
---
 demos/cast/src/main/AndroidManifest.xml    | 9 +++++++--
 demos/gl/build.gradle                      | 1 +
 demos/gl/src/main/AndroidManifest.xml      | 1 +
 demos/session/src/main/AndroidManifest.xml | 5 ++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index 2e07deae94..b6a9b56eac 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -22,8 +22,13 @@
 
   <uses-sdk/>
 
-  <application android:label="@string/application_name" android:icon="@mipmap/ic_launcher"
-      android:largeHeap="true" android:allowBackup="false">
+  <application
+      android:name="androidx.multidex.MultiDexApplication"
+      android:label="@string/application_name"
+      android:icon="@mipmap/ic_launcher"
+      android:largeHeap="true"
+      android:allowBackup="false"
+      android:taskAffinity="">
 
     <meta-data android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
         android:value="androidx.media3.cast.DefaultCastOptionsProvider"/>
diff --git a/demos/gl/build.gradle b/demos/gl/build.gradle
index 9aad43098b..ff8333a254 100644
--- a/demos/gl/build.gradle
+++ b/demos/gl/build.gradle
@@ -52,6 +52,7 @@ dependencies {
     implementation project(modulePrefix + 'lib-exoplayer-smoothstreaming')
     implementation project(modulePrefix + 'lib-ui')
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
+    implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
 }
diff --git a/demos/gl/src/main/AndroidManifest.xml b/demos/gl/src/main/AndroidManifest.xml
index d4d79a7053..d44f8ea343 100644
--- a/demos/gl/src/main/AndroidManifest.xml
+++ b/demos/gl/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
   <uses-sdk/>
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       android:icon="@mipmap/ic_launcher"
       android:label="@string/application_name">
diff --git a/demos/session/src/main/AndroidManifest.xml b/demos/session/src/main/AndroidManifest.xml
index e94b527e83..90557fc6c7 100644
--- a/demos/session/src/main/AndroidManifest.xml
+++ b/demos/session/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="androidx.media3.demo.session">
 
   <uses-sdk/>
@@ -21,10 +22,12 @@
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
   <application
+      android:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
-      android:theme="@style/Theme.Media3Demo">
+      android:theme="@style/Theme.Media3Demo"
+      tools:replace="android:name">
 
     <activity
         android:name=".MainActivity"