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

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

PiperOrigin-RevId: 470003836
(cherry picked from commit 142d1c062c4ed4fba450465588217ae5506fece3)
---
 extensions/cronet/src/androidTest/AndroidManifest.xml  | 2 ++
 extensions/flac/src/androidTest/AndroidManifest.xml    | 2 ++
 extensions/ima/src/androidTest/AndroidManifest.xml     | 2 ++
 extensions/media2/src/androidTest/AndroidManifest.xml  | 6 ++++++
 extensions/opus/src/androidTest/AndroidManifest.xml    | 2 ++
 extensions/vp9/src/androidTest/AndroidManifest.xml     | 2 ++
 library/core/src/androidTest/AndroidManifest.xml       | 2 ++
 library/datasource/src/androidTest/AndroidManifest.xml | 2 ++
 playbacktests/src/androidTest/AndroidManifest.xml      | 2 ++
 9 files changed, 22 insertions(+)

diff --git a/extensions/cronet/src/androidTest/AndroidManifest.xml b/extensions/cronet/src/androidTest/AndroidManifest.xml
index 5ce815adae..aac23f1bb2 100644
--- a/extensions/cronet/src/androidTest/AndroidManifest.xml
+++ b/extensions/cronet/src/androidTest/AndroidManifest.xml
@@ -22,7 +22,9 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-sdk/>
 
+  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
+    android:name="android.support.multidex.MultiDexApplication"
     android:allowBackup="false"
     android:usesCleartextTraffic="true"
     tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
diff --git a/extensions/flac/src/androidTest/AndroidManifest.xml b/extensions/flac/src/androidTest/AndroidManifest.xml
index 9e1133b34d..76d6b0db6a 100644
--- a/extensions/flac/src/androidTest/AndroidManifest.xml
+++ b/extensions/flac/src/androidTest/AndroidManifest.xml
@@ -21,7 +21,9 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-sdk/>
 
+  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
+      android:name="android.support.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 
diff --git a/extensions/ima/src/androidTest/AndroidManifest.xml b/extensions/ima/src/androidTest/AndroidManifest.xml
index c8bd575f60..98cfe2b0ce 100644
--- a/extensions/ima/src/androidTest/AndroidManifest.xml
+++ b/extensions/ima/src/androidTest/AndroidManifest.xml
@@ -23,7 +23,9 @@
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <uses-sdk/>
 
+  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
+      android:name="android.support.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
     <activity android:name="com.google.android.exoplayer2.testutil.HostActivity"
diff --git a/extensions/media2/src/androidTest/AndroidManifest.xml b/extensions/media2/src/androidTest/AndroidManifest.xml
index 4a9d03e991..d4046be298 100644
--- a/extensions/media2/src/androidTest/AndroidManifest.xml
+++ b/extensions/media2/src/androidTest/AndroidManifest.xml
@@ -22,6 +22,12 @@
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
   <uses-sdk/>
 
+  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
+  <application
+    android:name="android.support.multidex.MultiDexApplication"
+    android:allowBackup="false"
+    tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
+
   <instrumentation
       android:targetPackage="com.google.android.exoplayer2.ext.media2.test"
       android:name="androidx.test.runner.AndroidJUnitRunner"/>
diff --git a/extensions/opus/src/androidTest/AndroidManifest.xml b/extensions/opus/src/androidTest/AndroidManifest.xml
index 53ee20a584..5601d36597 100644
--- a/extensions/opus/src/androidTest/AndroidManifest.xml
+++ b/extensions/opus/src/androidTest/AndroidManifest.xml
@@ -21,7 +21,9 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-sdk/>
 
+  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
+      android:name="android.support.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 
diff --git a/extensions/vp9/src/androidTest/AndroidManifest.xml b/extensions/vp9/src/androidTest/AndroidManifest.xml
index b0d1a88c19..06b91fdf7c 100644
--- a/extensions/vp9/src/androidTest/AndroidManifest.xml
+++ b/extensions/vp9/src/androidTest/AndroidManifest.xml
@@ -21,7 +21,9 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-sdk/>
 
+  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
+      android:name="android.support.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 
diff --git a/library/core/src/androidTest/AndroidManifest.xml b/library/core/src/androidTest/AndroidManifest.xml
index ea61783474..1f5b714efb 100644
--- a/library/core/src/androidTest/AndroidManifest.xml
+++ b/library/core/src/androidTest/AndroidManifest.xml
@@ -22,7 +22,9 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-sdk/>
 
+  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
+      android:name="android.support.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"
       android:usesCleartextTraffic="true"/>
diff --git a/library/datasource/src/androidTest/AndroidManifest.xml b/library/datasource/src/androidTest/AndroidManifest.xml
index 82fda9bf67..a8ff9070c2 100644
--- a/library/datasource/src/androidTest/AndroidManifest.xml
+++ b/library/datasource/src/androidTest/AndroidManifest.xml
@@ -21,7 +21,9 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-sdk/>
 
+  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
+      android:name="android.support.multidex.MultiDexApplication"
       android:allowBackup="false"
       android:usesCleartextTraffic="true"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
diff --git a/playbacktests/src/androidTest/AndroidManifest.xml b/playbacktests/src/androidTest/AndroidManifest.xml
index 5f9b5429f9..902b71bd8d 100644
--- a/playbacktests/src/androidTest/AndroidManifest.xml
+++ b/playbacktests/src/androidTest/AndroidManifest.xml
@@ -23,7 +23,9 @@
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <uses-sdk/>
 
+  <!-- TODO(b/243799715): Use android:name="androidx.multidex.MultiDexApplication" instead. -->
   <application
+      android:name="android.support.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
     <activity android:name="com.google.android.exoplayer2.testutil.HostActivity"