| Index: media/media.gyp
|
| diff --git a/media/media.gyp b/media/media.gyp
|
| index 6bfddabc25404693805537d5c21ae16561576e18..a57b12d23fa3dbe8098689076160d73b831f2240 100644
|
| --- a/media/media.gyp
|
| +++ b/media/media.gyp
|
| @@ -1075,8 +1075,6 @@
|
| 'type': '<(gtest_target_type)',
|
| 'dependencies': [
|
| 'audio_test_config',
|
| - # TODO(mcasas): Remove this entry after https://crbug.com/618718.
|
| - 'capture/capture.gyp:unittests',
|
| 'cdm_paths',
|
| 'media',
|
| 'media_features',
|
| @@ -1500,8 +1498,6 @@
|
| 'type': '<(gtest_target_type)',
|
| 'dependencies': [
|
| 'audio_test_config',
|
| - # TODO(mcasas): Remove this entry after https://crbug.com/618718.
|
| - 'capture/capture.gyp:unittests',
|
| 'media_test_support',
|
| '../base/base.gyp:test_support_base',
|
| '../testing/gmock.gyp:gmock',
|
| @@ -1512,6 +1508,17 @@
|
| 'sources': [
|
| 'base/run_all_unittests.cc',
|
| ],
|
| + 'conditions': [
|
| + ['OS=="win"', {
|
| + 'link_settings': {
|
| + 'libraries': [
|
| + '-ldxguid.lib',
|
| + '-lsetupapi.lib',
|
| + '-lwinmm.lib',
|
| + ],
|
| + },
|
| + }],
|
| + ],
|
| },
|
| {
|
| # GN versions (it is split apart): //media:test_support,
|
| @@ -1857,8 +1864,6 @@
|
| 'base/android/video_decoder_job.h',
|
| 'base/android/video_media_codec_decoder.cc',
|
| 'base/android/video_media_codec_decoder.h',
|
| - 'capture/video/android/capture_jni_registrar.cc',
|
| - 'capture/video/android/capture_jni_registrar.h',
|
| ],
|
| 'conditions': [
|
| # Only 64 bit builds are using android-21 NDK library, check common.gypi
|
|
|