summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-23 18:26:31 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-23 18:26:31 +0000
commitf63d12fe2128a9f42b6a2655ede3604c88d01211 (patch)
tree0de1437bc0aaf74ed00d62ce612bcc9a1b79beb5 /build
parent11c2bdd10912ce3c4a8b9e1f67399e18014d2a19 (diff)
downloadchromium_src-f63d12fe2128a9f42b6a2655ede3604c88d01211.zip
chromium_src-f63d12fe2128a9f42b6a2655ede3604c88d01211.tar.gz
chromium_src-f63d12fe2128a9f42b6a2655ede3604c88d01211.tar.bz2
Move OpenGL ES 2.0 conformance test support into main tree
This support breaks often because it is not built but the buildbots. This CL adds it to the main tree so it will be built by the buildbots. Not sure where to add it in all.gyp but I need to make sure it's built TEST=opengl es 2.0 conformance tests still build BUG=83382 R=apatrick@chromium.org Review URL: http://codereview.chromium.org/7057033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 65dac15..6e6b3e0 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -17,6 +17,7 @@
'../ui/ui.gyp:*',
'../gpu/gpu.gyp:*',
'../gpu/demos/demos.gyp:*',
+ '../gpu/gles2_conform_support/gles2_conform_support.gyp:*',
'../ipc/ipc.gyp:*',
'../jingle/jingle.gyp:*',
'../media/media.gyp:*',
@@ -157,6 +158,7 @@
'../crypto/crypto.gyp:crypto_unittests',
'../ui/ui.gyp:gfx_unittests',
'../gpu/gpu.gyp:gpu_unittests',
+ '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:jingle_unittests',
'../media/media.gyp:media_unittests',