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