From e56f59514f05d4ccf53e96baf085349c118ceaa6 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 a395b23d985dd4a118b125c3d121a7e39e2e5435)
---
 demos/cast/src/main/AndroidManifest.xml | 9 +++++++--
 demos/gl/build.gradle                   | 1 +
 demos/gl/src/main/AndroidManifest.xml   | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index ebaab7bb24..fe17b9d639 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="com.google.android.exoplayer2.ext.cast.DefaultCastOptionsProvider"/>
diff --git a/demos/gl/build.gradle b/demos/gl/build.gradle
index 01b5808fe7..b08f5e4816 100644
--- a/demos/gl/build.gradle
+++ b/demos/gl/build.gradle
@@ -52,6 +52,7 @@ dependencies {
     implementation project(modulePrefix + 'library-smoothstreaming')
     implementation project(modulePrefix + 'library-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 4c95d1ec2f..6e27e1154f 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">