diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle index 80239beb22..5e603c24a5 100644 --- a/extensions/vp9/build.gradle +++ b/extensions/vp9/build.gradle @@ -29,9 +29,12 @@ android { testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } - sourceSets.main { - jniLibs.srcDir 'src/main/libs' - jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio. + sourceSets { + main { + jniLibs.srcDir 'src/main/libs' + jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio. + } + androidTest.assets.srcDir '../../testdata/src/test/assets/' } testOptions.unitTests.includeAndroidResources = true diff --git a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java index 44dec0270f..806d826103 100644 --- a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java +++ b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java @@ -42,10 +42,10 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class VpxPlaybackTest { - private static final String BEAR_URI = "asset:///bear-vp9.webm"; - private static final String BEAR_ODD_DIMENSIONS_URI = "asset:///bear-vp9-odd-dimensions.webm"; - private static final String ROADTRIP_10BIT_URI = "asset:///roadtrip-vp92-10bit.webm"; - private static final String INVALID_BITSTREAM_URI = "asset:///invalid-bitstream.webm"; + private static final String BEAR_URI = "asset:///vp9/bear-vp9.webm"; + private static final String BEAR_ODD_DIMENSIONS_URI = "asset:///vp9/bear-vp9-odd-dimensions.webm"; + private static final String ROADTRIP_10BIT_URI = "asset:///vp9/roadtrip-vp92-10bit.webm"; + private static final String INVALID_BITSTREAM_URI = "asset:///vp9/invalid-bitstream.webm"; private static final String TAG = "VpxPlaybackTest"; diff --git a/extensions/vp9/src/androidTest/assets/bear-vp9-odd-dimensions.webm b/testdata/src/test/assets/vp9/bear-vp9-odd-dimensions.webm similarity index 100% rename from extensions/vp9/src/androidTest/assets/bear-vp9-odd-dimensions.webm rename to testdata/src/test/assets/vp9/bear-vp9-odd-dimensions.webm diff --git a/extensions/vp9/src/androidTest/assets/bear-vp9.webm b/testdata/src/test/assets/vp9/bear-vp9.webm similarity index 100% rename from extensions/vp9/src/androidTest/assets/bear-vp9.webm rename to testdata/src/test/assets/vp9/bear-vp9.webm diff --git a/extensions/vp9/src/androidTest/assets/invalid-bitstream.webm b/testdata/src/test/assets/vp9/invalid-bitstream.webm similarity index 100% rename from extensions/vp9/src/androidTest/assets/invalid-bitstream.webm rename to testdata/src/test/assets/vp9/invalid-bitstream.webm diff --git a/extensions/vp9/src/androidTest/assets/roadtrip-vp92-10bit.webm b/testdata/src/test/assets/vp9/roadtrip-vp92-10bit.webm similarity index 100% rename from extensions/vp9/src/androidTest/assets/roadtrip-vp92-10bit.webm rename to testdata/src/test/assets/vp9/roadtrip-vp92-10bit.webm