From c96e010d351bdd8b45f88b9731c5a80bcec0d2d4 Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Tue, 20 Sep 2022 15:25:38 +0000
Subject: [PATCH] Fix instrumentation tests not working via Gradle

PiperOrigin-RevId: 475560401
---
 libraries/datasource/build.gradle                             | 1 +
 libraries/datasource/src/androidTest/AndroidManifest.xml      | 3 +--
 libraries/datasource_cronet/build.gradle                      | 2 +-
 .../datasource_cronet/src/androidTest/AndroidManifest.xml     | 3 +--
 libraries/decoder_flac/build.gradle                           | 4 ++++
 libraries/decoder_flac/src/androidTest/AndroidManifest.xml    | 3 +--
 libraries/decoder_opus/build.gradle                           | 1 +
 libraries/decoder_opus/src/androidTest/AndroidManifest.xml    | 3 +--
 libraries/decoder_vp9/build.gradle                            | 1 +
 libraries/decoder_vp9/src/androidTest/AndroidManifest.xml     | 3 +--
 libraries/exoplayer/build.gradle                              | 1 +
 libraries/exoplayer/src/androidTest/AndroidManifest.xml       | 3 +--
 libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml   | 3 +--
 libraries/session/build.gradle                                | 1 +
 libraries/session/src/androidTest/AndroidManifest.xml         | 3 +--
 libraries/test_exoplayer_playback/build.gradle                | 1 +
 .../src/androidTest/AndroidManifest.xml                       | 3 +--
 17 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/libraries/datasource/build.gradle b/libraries/datasource/build.gradle
index 7706ffc0b3..5bf5c91f51 100644
--- a/libraries/datasource/build.gradle
+++ b/libraries/datasource/build.gradle
@@ -39,6 +39,7 @@ dependencies {
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion
diff --git a/libraries/datasource/src/androidTest/AndroidManifest.xml b/libraries/datasource/src/androidTest/AndroidManifest.xml
index 6543ffe575..5e7a406a7d 100644
--- a/libraries/datasource/src/androidTest/AndroidManifest.xml
+++ b/libraries/datasource/src/androidTest/AndroidManifest.xml
@@ -21,9 +21,8 @@
   <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:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       android:usesCleartextTraffic="true"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
diff --git a/libraries/datasource_cronet/build.gradle b/libraries/datasource_cronet/build.gradle
index 79b8389f57..d372272a33 100644
--- a/libraries/datasource_cronet/build.gradle
+++ b/libraries/datasource_cronet/build.gradle
@@ -27,9 +27,9 @@ dependencies {
     compileOnly 'com.google.errorprone:error_prone_annotations:' + errorProneVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:rules:' + androidxTestRulesVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
-    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion
     // Instrumentation tests assume that an app-packaged version of cronet is
     // available.
diff --git a/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml b/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
index 818af43314..fd7a6dcc79 100644
--- a/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
+++ b/libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
@@ -22,9 +22,8 @@
   <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:name="androidx.multidex.MultiDexApplication"
     android:allowBackup="false"
     android:usesCleartextTraffic="true"
     tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
diff --git a/libraries/decoder_flac/build.gradle b/libraries/decoder_flac/build.gradle
index 522cd160c6..de0fb39ac5 100644
--- a/libraries/decoder_flac/build.gradle
+++ b/libraries/decoder_flac/build.gradle
@@ -14,6 +14,9 @@
 apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
 
 android {
+    defaultConfig {
+        multiDexEnabled true
+    }
     sourceSets {
         main {
             jniLibs.srcDir 'src/main/libs'
@@ -31,6 +34,7 @@ dependencies {
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
     androidTestImplementation project(modulePrefix + 'test-utils')
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     testImplementation 'androidx.test:core:' + androidxTestCoreVersion
     testImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
diff --git a/libraries/decoder_flac/src/androidTest/AndroidManifest.xml b/libraries/decoder_flac/src/androidTest/AndroidManifest.xml
index 60caa1b1cc..d28b481540 100644
--- a/libraries/decoder_flac/src/androidTest/AndroidManifest.xml
+++ b/libraries/decoder_flac/src/androidTest/AndroidManifest.xml
@@ -21,9 +21,8 @@
   <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:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 
diff --git a/libraries/decoder_opus/build.gradle b/libraries/decoder_opus/build.gradle
index 1f3f7d8d53..c7dc538a66 100644
--- a/libraries/decoder_opus/build.gradle
+++ b/libraries/decoder_opus/build.gradle
@@ -31,6 +31,7 @@ dependencies {
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
     testImplementation project(modulePrefix + 'test-utils')
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
 }
diff --git a/libraries/decoder_opus/src/androidTest/AndroidManifest.xml b/libraries/decoder_opus/src/androidTest/AndroidManifest.xml
index 039dc819cc..ab27436543 100644
--- a/libraries/decoder_opus/src/androidTest/AndroidManifest.xml
+++ b/libraries/decoder_opus/src/androidTest/AndroidManifest.xml
@@ -21,9 +21,8 @@
   <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:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 
diff --git a/libraries/decoder_vp9/build.gradle b/libraries/decoder_vp9/build.gradle
index e723f74fd7..adb52f8dbe 100644
--- a/libraries/decoder_vp9/build.gradle
+++ b/libraries/decoder_vp9/build.gradle
@@ -31,6 +31,7 @@ dependencies {
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
     testImplementation project(modulePrefix + 'test-utils')
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
     androidTestImplementation 'com.google.truth:truth:' + truthVersion
diff --git a/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml b/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml
index ca0f8bc647..b22a45dedd 100644
--- a/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml
+++ b/libraries/decoder_vp9/src/androidTest/AndroidManifest.xml
@@ -21,9 +21,8 @@
   <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:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
 
diff --git a/libraries/exoplayer/build.gradle b/libraries/exoplayer/build.gradle
index 6e4369a9e8..c65cddffe6 100644
--- a/libraries/exoplayer/build.gradle
+++ b/libraries/exoplayer/build.gradle
@@ -48,6 +48,7 @@ dependencies {
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
     compileOnly 'com.google.errorprone:error_prone_annotations:' + errorProneVersion
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion
diff --git a/libraries/exoplayer/src/androidTest/AndroidManifest.xml b/libraries/exoplayer/src/androidTest/AndroidManifest.xml
index 08ccac6a01..cee0ce28ad 100644
--- a/libraries/exoplayer/src/androidTest/AndroidManifest.xml
+++ b/libraries/exoplayer/src/androidTest/AndroidManifest.xml
@@ -22,9 +22,8 @@
   <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:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"
       android:usesCleartextTraffic="true"/>
diff --git a/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml b/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml
index ae78b13483..986dce0394 100644
--- a/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml
+++ b/libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml
@@ -23,9 +23,8 @@
   <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:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
     <activity android:name="androidx.media3.test.utils.HostActivity"
diff --git a/libraries/session/build.gradle b/libraries/session/build.gradle
index ec89bc41df..74e341395f 100644
--- a/libraries/session/build.gradle
+++ b/libraries/session/build.gradle
@@ -40,6 +40,7 @@ dependencies {
     androidTestImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
     androidTestImplementation project(modulePrefix + 'test-utils')
     androidTestImplementation project(modulePrefix + 'test-data')
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     testImplementation project(modulePrefix + 'test-utils')
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
diff --git a/libraries/session/src/androidTest/AndroidManifest.xml b/libraries/session/src/androidTest/AndroidManifest.xml
index e3a794f9ab..e2ff3e005b 100644
--- a/libraries/session/src/androidTest/AndroidManifest.xml
+++ b/libraries/session/src/androidTest/AndroidManifest.xml
@@ -22,9 +22,8 @@
   <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:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode"
       android:usesCleartextTraffic="true"/>
diff --git a/libraries/test_exoplayer_playback/build.gradle b/libraries/test_exoplayer_playback/build.gradle
index 9d7daeaaee..4991a5820d 100644
--- a/libraries/test_exoplayer_playback/build.gradle
+++ b/libraries/test_exoplayer_playback/build.gradle
@@ -20,6 +20,7 @@ android {
 }
 
 dependencies {
+    androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:rules:' + androidxTestRulesVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
diff --git a/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml b/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
index 652ff94d66..2374319ed6 100644
--- a/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
+++ b/libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
@@ -23,9 +23,8 @@
   <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:name="androidx.multidex.MultiDexApplication"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
     <activity android:name="androidx.media3.test.utils.HostActivity"