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
DiceTechnology · Oct 19, 2022 · 142d1c0 · 142d1c0
1 parent f454c9a
commit 142d1c0
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"