| Index: media/test/BUILD.gn
|
| diff --git a/media/test/BUILD.gn b/media/test/BUILD.gn
|
| index b2b5002a9d220979145de93dfeaeb51339865281..c4f4d4d187c6fdc604c326b3c00da3e968e738ca 100644
|
| --- a/media/test/BUILD.gn
|
| +++ b/media/test/BUILD.gn
|
| @@ -7,7 +7,9 @@ import("//media/media_options.gni")
|
| source_set("pipeline_integration_test_base") {
|
| testonly = true
|
|
|
| - if (media_use_ffmpeg) {
|
| + # Even if FFmpeg is enabled on Android we don't want these.
|
| + # TODO(watk): Refactor tests that could be made to run on Android.
|
| + if (media_use_ffmpeg && !is_android) {
|
| sources = [
|
| "pipeline_integration_test_base.cc",
|
| "pipeline_integration_test_base.h",
|
| @@ -28,7 +30,7 @@ source_set("pipeline_integration_test_base") {
|
| source_set("pipeline_integration_tests") {
|
| testonly = true
|
|
|
| - if (media_use_ffmpeg) {
|
| + if (media_use_ffmpeg && !is_android) {
|
| sources = [
|
| "pipeline_integration_test.cc",
|
| ]
|
| @@ -56,7 +58,7 @@ source_set("pipeline_integration_tests") {
|
| source_set("pipeline_integration_perftests") {
|
| testonly = true
|
|
|
| - if (media_use_ffmpeg) {
|
| + if (media_use_ffmpeg && !is_android) {
|
| sources = [
|
| "pipeline_integration_perftest.cc",
|
| ]
|
| @@ -79,7 +81,7 @@ if (!is_component_build) {
|
| source_set("mojo_pipeline_integration_tests") {
|
| testonly = true
|
|
|
| - if (media_use_ffmpeg) {
|
| + if (media_use_ffmpeg && !is_android) {
|
| sources = [
|
| "pipeline_integration_test.cc",
|
| ]
|
|
|