summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 23:18:53 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 23:18:53 +0000
commit5a5473381495625fdf691f93be48497f4edf003d (patch)
tree71210a4a0d933a71bcaa0c25db7930af891cf1d8 /media
parentab0367457117bc9f408be8730074befa57f93e51 (diff)
downloadchromium_src-5a5473381495625fdf691f93be48497f4edf003d.zip
chromium_src-5a5473381495625fdf691f93be48497f4edf003d.tar.gz
chromium_src-5a5473381495625fdf691f93be48497f4edf003d.tar.bz2
Globally replace <(library) with static_library
We provided <(library) as a variable to support a peculiar build configuration on Linux. We no longer support that build configuration, so we can simplify this code to no longer use a variable. Review URL: http://codereview.chromium.org/7051014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/media.gyp12
1 files changed, 6 insertions, 6 deletions
diff --git a/media/media.gyp b/media/media.gyp
index c61e8c2..9b6b195 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'media',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'yuv_convert',
'../base/base.gyp:base',
@@ -256,7 +256,7 @@
},
{
'target_name': 'cpu_features',
- 'type': '<(library)',
+ 'type': 'static_library',
'include_dirs': [
'..',
],
@@ -278,7 +278,7 @@
},
{
'target_name': 'yuv_convert',
- 'type': '<(library)',
+ 'type': 'static_library',
'include_dirs': [
'..',
],
@@ -305,7 +305,7 @@
},
{
'target_name': 'yuv_convert_sse2',
- 'type': '<(library)',
+ 'type': 'static_library',
'include_dirs': [
'..',
],
@@ -445,7 +445,7 @@
},
{
'target_name': 'media_test_support',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'media',
'../base/base.gyp:base',
@@ -710,7 +710,7 @@
},
{
'target_name': 'omx_wrapper',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'../third_party/openmax/openmax.gyp:il',