diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 18:03:13 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 18:03:13 +0000 |
| commit | 18cff3d436dec4c4d78f9bcf305d0a658f503dcc (patch) | |
| tree | 647f10140ca95959d2b5865cc85de6c6ca8f421d /media | |
| parent | b093cd0a781df58f829419f68ca5c2212d6b9998 (diff) | |
| download | chromium_src-18cff3d436dec4c4d78f9bcf305d0a658f503dcc.zip chromium_src-18cff3d436dec4c4d78f9bcf305d0a658f503dcc.tar.gz chromium_src-18cff3d436dec4c4d78f9bcf305d0a658f503dcc.tar.bz2 | |
media: remove redundant gyp excludes
I moved all of these general patterns to common.gypi.
Also rearrange the common.gypi patterns to cover more common
Linux patterns.
Review URL: http://codereview.chromium.org/608032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/media.gyp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/media/media.gyp b/media/media.gyp index f0f15b7..eb5c392 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -7,14 +7,6 @@ 'chromium_code': 1, 'player_x11_renderer%': 'x11', }, - 'target_defaults': { - 'conditions': [ - ['OS!="linux"', {'sources/': [['exclude', '/linux/']]}], - ['OS!="freebsd"', {'sources/': [['exclude', '/freebsd/']]}], - ['OS!="mac"', {'sources/': [['exclude', '/mac/']]}], - ['OS!="win"', {'sources/': [['exclude', '/win/']]}], - ], - }, 'targets': [ { 'target_name': 'media', @@ -140,22 +132,12 @@ }, 'conditions': [ ['OS =="linux"', { - 'sources/': [ ['exclude', '_(mac|win)\\.cc$'], - ['exclude', '\\.mm?$' ] ], 'link_settings': { 'libraries': [ '-lasound', ], }, }], - ['OS =="freebsd"', { - 'sources/': [ ['exclude', '_(mac|win)\\.cc$'], - ['exclude', '\\.mm?$' ] ], - 'link_settings': { - 'libraries': [ - ], - }, - }], ['OS =="mac"', { 'link_settings': { 'libraries': [ @@ -163,12 +145,6 @@ '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', ], }, - 'sources/': [ ['exclude', '_(linux|win)\\.cc$'], - ], - }], - [ 'OS == "win"', { - 'sources/': [ ['exclude', '_(linux|mac|posix)\\.cc$'], - ['exclude', '\\.mm?$' ] ], }], ], }, |