summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-12 20:36:34 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-12 20:36:34 +0000
commit1bbb76e872c1dd6284a244b76d81d49650b43a4f (patch)
tree3072642538b1ec6dc3d1302fcc9a7cb12c15d67c /webkit
parent1ce7b66b8e871fb39633e8dc7547a649f6d60b53 (diff)
downloadchromium_src-1bbb76e872c1dd6284a244b76d81d49650b43a4f.zip
chromium_src-1bbb76e872c1dd6284a244b76d81d49650b43a4f.tar.gz
chromium_src-1bbb76e872c1dd6284a244b76d81d49650b43a4f.tar.bz2
Compile webkit gpu code in an upstream build too.
I had originally disabled this when setting up the upstream webkit.org build. At the time we didn't compile any of src/gpu, but now we do, so it's safe to enable this. If we don't compile this, shared library (.so) builds in a webkit only tree fail to link because of missing symbols. Review URL: http://codereview.chromium.org/3722002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webkit_glue.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 68336aa..48f48d3 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -433,7 +433,7 @@
],
},
}],
- ['enable_gpu==1 and inside_chromium_build==1', {
+ ['enable_gpu==1', {
'sources': [
'plugins/pepper_graphics_3d_gl.cc',
'plugins/pepper_graphics_3d.cc',