diff options
author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 03:07:07 +0000 |
---|---|---|
committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 03:07:07 +0000 |
commit | 4049046a39cb364577a1ac8a2aac47a86afc5b7b (patch) | |
tree | e670e88f432ee925b7b89994eff756052739af60 /webkit/webkit.gyp | |
parent | 07a174f4c159a347c6d7e10a5f3da2d5966c92d1 (diff) | |
download | chromium_src-4049046a39cb364577a1ac8a2aac47a86afc5b7b.zip chromium_src-4049046a39cb364577a1ac8a2aac47a86afc5b7b.tar.gz chromium_src-4049046a39cb364577a1ac8a2aac47a86afc5b7b.tar.bz2 |
linux: implement gpu plugin
Review URL: http://codereview.chromium.org/500132
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35509 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!': [ |