Index: media/media.gyp |
=================================================================== |
--- media/media.gyp (revision 98516) |
+++ media/media.gyp (working copy) |
@@ -11,7 +11,7 @@ |
'targets': [ |
{ |
'target_name': 'media', |
- 'type': 'static_library', |
+ 'type': '<(component)', |
'dependencies': [ |
'yuv_convert', |
'../base/base.gyp:base', |
@@ -19,7 +19,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': [ |
'..', |
], |
@@ -108,6 +112,7 @@ |
'base/h264_bitstream_converter.cc', |
'base/h264_bitstream_converter.h', |
'base/media.h', |
+ 'base/media_export.h', |
'base/media_log.cc', |
'base/media_log.h', |
'base/media_log_event.h', |
@@ -421,6 +426,7 @@ |
'dependencies': [ |
'media', |
'media_test_support', |
+ 'yuv_convert', |
'../base/base.gyp:base', |
'../base/base.gyp:base_i18n', |
'../base/base.gyp:test_support_base', |
@@ -529,6 +535,7 @@ |
'type': 'executable', |
'dependencies': [ |
'media', |
+ 'yuv_convert', |
'../base/base.gyp:base', |
'../skia/skia.gyp:skia', |
], |
@@ -575,7 +582,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', |
@@ -627,6 +636,7 @@ |
'type': 'executable', |
'dependencies': [ |
'media', |
+ 'yuv_convert', |
'../base/base.gyp:base', |
], |
'include_dirs': [ |
@@ -652,6 +662,7 @@ |
'type': 'executable', |
'dependencies': [ |
'media', |
+ 'yuv_convert', |
'../base/base.gyp:base', |
'../ui/gfx/gl/gl.gyp:gl', |
], |
@@ -718,6 +729,7 @@ |
'type': 'executable', |
'dependencies': [ |
'media', |
+ 'yuv_convert', |
'../base/base.gyp:base', |
'../ui/gfx/gl/gl.gyp:gl', |
], |