diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-06 04:38:55 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-06 04:38:55 +0000 |
| commit | be4f188066196d7bd0a4a7a62254bb603e566f74 (patch) | |
| tree | a493671ea3e09fec3d20c86a0e452d509e7c9954 /webkit/webkit.gyp | |
| parent | ee3cd175f8592b2b1f2ccd14b071d56ca733a5c6 (diff) | |
| download | chromium_src-be4f188066196d7bd0a4a7a62254bb603e566f74.zip chromium_src-be4f188066196d7bd0a4a7a62254bb603e566f74.tar.gz chromium_src-be4f188066196d7bd0a4a7a62254bb603e566f74.tar.bz2 | |
linux: implement gpu plugin
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=35509
Review URL: http://codereview.chromium.org/500132
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index cf0ff34..c95ad3a 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -428,7 +428,12 @@ ['exclude', r'/gtk_']], }], ['OS!="mac"', { - 'sources/': [['exclude', '_mac\\.(cc|mm)$']] + 'sources/': [['exclude', '_mac\\.(cc|mm)$']], + }], + ['OS=="win" or (OS=="linux" and target_arch!="arm")', { + 'dependencies': [ + '../gpu/gpu.gyp:gpu_plugin', + ], }], ['OS!="win"', { 'sources/': [['exclude', '_win\\.cc$']], @@ -446,7 +451,6 @@ ], 'dependencies': [ '../build/win/system.gyp:cygwin', - '../gpu/gpu.gyp:gpu_plugin', 'default_plugin/default_plugin.gyp:default_plugin', ], 'sources!': [ |