| Index: media/base/BUILD.gn
|
| diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
|
| index 3565553d7523197eba2f08fe687ea53a78e0a85b..691e13054d527432c81580d228b713e482a09c07 100644
|
| --- a/media/base/BUILD.gn
|
| +++ b/media/base/BUILD.gn
|
| @@ -220,13 +220,17 @@ source_set("base") {
|
|
|
| if (media_use_ffmpeg) {
|
| sources += [
|
| - "audio_video_metadata_extractor.cc",
|
| - "audio_video_metadata_extractor.h",
|
| "container_names.cc",
|
| "container_names.h",
|
| - "media_file_checker.cc",
|
| - "media_file_checker.h",
|
| ]
|
| + if (!is_android) {
|
| + sources += [
|
| + "audio_video_metadata_extractor.cc",
|
| + "audio_video_metadata_extractor.h",
|
| + "media_file_checker.cc",
|
| + "media_file_checker.h",
|
| + ]
|
| + }
|
|
|
| deps += [ "//third_party/ffmpeg" ]
|
| }
|
| @@ -432,7 +436,9 @@ source_set("unittests") {
|
| "//testing/gtest",
|
| ]
|
|
|
| - 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 += [
|
| "audio_video_metadata_extractor_unittest.cc",
|
| "media_file_checker_unittest.cc",
|
|
|