Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(536)

Unified Diff: media/media.gyp

Issue 1313603004: MediaRecorderHandler (video part) and unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved DCHECK_EQ() Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/capture/webm_muxer_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 79980a403fc1d70c3920a1b69a2414551996ae87..2ad3ef10d4ae647153a4deb019ba86eb8ef18542 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -478,8 +478,6 @@
'capture/video/win/video_capture_device_mf_win.h',
'capture/video/win/video_capture_device_win.cc',
'capture/video/win/video_capture_device_win.h',
- 'capture/webm_muxer.cc',
- 'capture/webm_muxer.h',
'cdm/aes_decryptor.cc',
'cdm/aes_decryptor.h',
'cdm/default_cdm_factory.cc',
@@ -700,9 +698,7 @@
'dependencies': [
'<(DEPTH)/third_party/libwebm/libwebm.gyp:libwebm',
],
- }, { # media_use_libwebm==0
- # Exclude the sources that depend on libwebm.
- 'sources!': [
+ 'sources': [
'capture/webm_muxer.cc',
'capture/webm_muxer.h',
],
@@ -1273,7 +1269,6 @@
'filters/vp8_parser_unittest.cc',
'filters/vp9_parser_unittest.cc',
'filters/vp9_raw_bits_reader_unittest.cc',
- 'capture/webm_muxer_unittest.cc',
'formats/common/offset_byte_queue_unittest.cc',
'formats/webm/cluster_builder.cc',
'formats/webm/cluster_builder.h',
@@ -1337,9 +1332,7 @@
'dependencies': [
'<(DEPTH)/third_party/libwebm/libwebm.gyp:libwebm',
],
- }, { # media_use_libwebm==0
- # Exclude the sources that depend on libwebm.
- 'sources!': [
+ 'sources': [
'capture/webm_muxer_unittest.cc',
],
}],
« no previous file with comments | « media/capture/webm_muxer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698