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

Unified Diff: media/media.gyp

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling DEPS to pick up ffmpeg GYP changes Created 5 years, 7 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
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 0a772b77a5acd5bba6f78b7a27cccc529f1a317a..98eb7055d55272cad5fb47ab39606de2e44acdd4 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -327,10 +327,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/mime_util.cc',
'base/mime_util.h',
'base/moving_average.cc',
@@ -628,7 +626,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',
@@ -697,7 +694,6 @@
'sources': [
'base/media.cc',
'base/media.h',
- 'base/media_stub.cc',
],
'sources!': [
'filters/opus_audio_decoder.cc',
@@ -1257,7 +1253,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': [

Powered by Google App Engine
This is Rietveld 408576698