loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix instrumentation tests not working via Gradle

Browse Source 
PiperOrigin-RevId: 475560401
This commit is contained in:
rohks 2022-09-20 15:25:38 +00:00 committed by Marc Baechinger
parent 75141f3016
commit c96e010d35
17 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/datasource/build.gradle
View File

@ -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

3
libraries/datasource/src/androidTest/AndroidManifest.xml
View File

@ -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">

2
libraries/datasource_cronet/build.gradle
View File

@ -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.

3
libraries/datasource_cronet/src/androidTest/AndroidManifest.xml
View File

@ -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"/>

4
libraries/decoder_flac/build.gradle
View File

@ -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

3
libraries/decoder_flac/src/androidTest/AndroidManifest.xml
View File

@ -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"/>

1
libraries/decoder_opus/build.gradle
View File

@ -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
}

3
libraries/decoder_opus/src/androidTest/AndroidManifest.xml
View File

@ -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"/>

1
libraries/decoder_vp9/build.gradle
View File

@ -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

3
libraries/decoder_vp9/src/androidTest/AndroidManifest.xml
View File

@ -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"/>

1
libraries/exoplayer/build.gradle
View File

@ -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

3
libraries/exoplayer/src/androidTest/AndroidManifest.xml
View File

@ -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"/>

3
libraries/exoplayer_ima/src/androidTest/AndroidManifest.xml
View File

@ -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"

1
libraries/session/build.gradle
View File

@ -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

3
libraries/session/src/androidTest/AndroidManifest.xml
View File

@ -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"/>

1
libraries/test_exoplayer_playback/build.gradle
View File

@ -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

3
libraries/test_exoplayer_playback/src/androidTest/AndroidManifest.xml
View File

@ -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"