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

Unified Diff: media/media.gyp

Issue 1179953006: [Merge to M44] Chromium changes to statically link ffmpeg. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
Patch Set: Created 5 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/ffmpeg_glue.cc ('k') | media/media_nacl.gyp » ('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 ed6aa6698b69d7b276f4c2d0ddcfcd2a957e17c4..c768fe366caf3aae4690323addaa72e6461c6b2a 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -326,10 +326,8 @@
'base/media_log_event.h',
'base/media_permission.cc',
'base/media_permission.h',
- 'base/media_posix.cc',
'base/media_switches.cc',
'base/media_switches.h',
- 'base/media_win.cc',
'base/moving_average.cc',
'base/moving_average.h',
'base/multi_channel_resampler.cc',
@@ -623,7 +621,6 @@
'base/container_names.h',
'base/media_file_checker.cc',
'base/media_file_checker.h',
- 'base/media_posix.cc',
'ffmpeg/ffmpeg_common.cc',
'ffmpeg/ffmpeg_common.h',
'filters/audio_file_reader.cc',
@@ -692,7 +689,6 @@
'sources': [
'base/media.cc',
'base/media.h',
- 'base/media_stub.cc',
],
'sources!': [
'filters/opus_audio_decoder.cc',
@@ -1251,7 +1247,7 @@
'test/pipeline_integration_test_base.cc',
],
}],
- ['os_posix==1 and OS!="mac"', {
+ ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_library" and win_use_allocator_shim==1)', {
'conditions': [
['use_allocator!="none"', {
'dependencies': [
« no previous file with comments | « media/filters/ffmpeg_glue.cc ('k') | media/media_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698