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

Unified Diff: media/media.gyp

Issue 14891002: Remove function level static initializers media library initialization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 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
« no previous file with comments | « media/base/run_all_unittests.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 f447379728e2c0f449a6c61161b1f0061bf54609..5f38e3efcc86553e68e0682a3d6ae72853f89f79 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -259,6 +259,7 @@
'base/djb2.h',
'base/filter_collection.cc',
'base/filter_collection.h',
+ 'base/media.cc',
'base/media.h',
'base/media_log.cc',
'base/media_log.h',
@@ -560,6 +561,7 @@
['include', '^audio/fake_audio_output_stream\\.'],
['include', '^base/audio_bus\\.'],
['include', '^base/channel_layout\\.'],
+ ['include', '^base/media\\.cc$'],
['include', '^base/media_stub\\.cc$'],
['include', '^base/media_switches\\.'],
['include', '^base/vector_math\\.'],
@@ -586,6 +588,10 @@
'player_android',
'video_capture_android_jni_headers',
],
+ 'sources': [
+ 'base/media.cc',
+ 'base/media.h',
+ ],
'conditions': [
['android_webview_build == 0', {
'dependencies': [
@@ -1188,7 +1194,7 @@
'base/simd/convert_yuv_to_rgb_sse.asm',
'base/simd/convert_yuv_to_rgb_x86.cc',
'base/simd/convert_yuva_to_argb_mmx.asm',
- 'base/simd/convert_yuva_to_argb_mmx.inc',
+ 'base/simd/convert_yuva_to_argb_mmx.inc',
'base/simd/empty_register_state_mmx.asm',
'base/simd/filter_yuv.h',
'base/simd/filter_yuv_c.cc',
« no previous file with comments | « media/base/run_all_unittests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698