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

Unified Diff: media/media.gyp

Issue 7572040: Enable media.dll / libmedia.so. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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_base.h ('k') | media/video/capture/fake_video_capture_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
===================================================================
--- media/media.gyp (revision 95624)
+++ media/media.gyp (working copy)
@@ -9,7 +9,7 @@
'targets': [
{
'target_name': 'media',
- 'type': 'static_library',
+ 'type': '<(component)',
'dependencies': [
'yuv_convert',
'../base/base.gyp:base',
@@ -17,7 +17,11 @@
'../build/temp_gyp/googleurl.gyp:googleurl',
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
'../third_party/openmax/openmax.gyp:il',
+ '../ui/ui.gyp:ui',
],
+ 'defines': [
+ 'MEDIA_IMPLEMENTATION',
+ ],
'include_dirs': [
'..',
],
@@ -104,6 +108,7 @@
'base/h264_bitstream_converter.cc',
'base/h264_bitstream_converter.h',
'base/media.h',
+ 'base/media_export.h',
'base/media_posix.cc',
'base/media_switches.cc',
'base/media_switches.h',
@@ -389,6 +394,7 @@
'dependencies': [
'media',
'media_test_support',
+ 'yuv_convert',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
@@ -497,6 +503,7 @@
'type': 'executable',
'dependencies': [
'media',
+ 'yuv_convert',
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
],
@@ -543,7 +550,9 @@
'type': 'executable',
'dependencies': [
'media',
+ 'yuv_convert',
'../base/base.gyp:base',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
@@ -595,6 +604,7 @@
'type': 'executable',
'dependencies': [
'media',
+ 'yuv_convert',
'../base/base.gyp:base',
],
'include_dirs': [
@@ -620,6 +630,7 @@
'type': 'executable',
'dependencies': [
'media',
+ 'yuv_convert',
'../base/base.gyp:base',
'../ui/gfx/gl/gl.gyp:gl',
],
@@ -686,6 +697,7 @@
'type': 'executable',
'dependencies': [
'media',
+ 'yuv_convert',
'../base/base.gyp:base',
'../ui/gfx/gl/gl.gyp:gl',
],
« no previous file with comments | « media/filters/video_renderer_base.h ('k') | media/video/capture/fake_video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698