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

Unified Diff: media/media.gyp

Issue 126170: Make the generated stubs weak. Enable the unittests that had conflicting symbols. (Closed)
Patch Set: Fix indent.w Created 11 years, 6 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/filters/video_renderer_unittest.cc ('k') | third_party/ffmpeg/generate_stubs.py » ('j') | 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 8453038613e6b5e12844db1ed1c11e8a2e297acb..9d283fcf53699c75842e14e1633568a9870bd981 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -171,18 +171,6 @@
# gtk/gtk.h
'../build/linux/system.gyp:gtk',
],
- 'sources!': [
- 'filters/ffmpeg_demuxer_unittest.cc',
- 'filters/ffmpeg_glue_unittest.cc',
- 'filters/ffmpeg_video_decoder_unittest.cc',
- ],
- }],
- ['OS=="mac"', {
- 'sources!': [
- 'filters/ffmpeg_demuxer_unittest.cc',
- 'filters/ffmpeg_glue_unittest.cc',
- 'filters/ffmpeg_video_decoder_unittest.cc',
- ],
}],
],
},
« no previous file with comments | « media/filters/video_renderer_unittest.cc ('k') | third_party/ffmpeg/generate_stubs.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698