Chromium Code Reviews| Index: media/base/BUILD.gn |
| diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn |
| index 7e816e3a26ce5798951c1f3dd1ebb5a7f53ee8af..684edfdbbf2c2906a6b72617d348fd65701a45bd 100644 |
| --- a/media/base/BUILD.gn |
| +++ b/media/base/BUILD.gn |
| @@ -395,7 +395,6 @@ source_set("unittests") { |
| "callback_holder_unittest.cc", |
| "channel_mixer_unittest.cc", |
| "channel_mixing_matrix_unittest.cc", |
| - "container_names_unittest.cc", |
| "data_buffer_unittest.cc", |
| "decoder_buffer_queue_unittest.cc", |
| "decoder_buffer_unittest.cc", |
| @@ -440,6 +439,10 @@ source_set("unittests") { |
| "//testing/gtest", |
| ] |
| + if (media_use_ffmpeg) { |
|
DaleCurtis
2016/02/29 23:17:46
This doesn't require ffmpeg, why the move?
Tima Vaisburd
2016/03/01 00:14:22
Because container_names.h and .cc are conditionall
DaleCurtis
2016/03/01 00:16:37
Yes you should be able to include them uncondition
Tima Vaisburd
2016/03/01 00:48:55
Done.
|
| + sources += [ "container_names_unittest.cc" ] |
| + } |
| + |
| # 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) { |