diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-23 19:01:46 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-23 19:01:46 +0000 |
| commit | 68c51ad5dd7a93413ba8cb54c97005c0072163f2 (patch) | |
| tree | d80bb7e7f32ce3da0254e6ff5a58886ef6aac1fe /build/all.gyp | |
| parent | 78f6188251556c3065b8bb3f3926f48a1a49c0eb (diff) | |
| download | chromium_src-68c51ad5dd7a93413ba8cb54c97005c0072163f2.zip chromium_src-68c51ad5dd7a93413ba8cb54c97005c0072163f2.tar.gz chromium_src-68c51ad5dd7a93413ba8cb54c97005c0072163f2.tar.bz2 | |
Revert 86306 (failed compile on win builder) - 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
TBR=gman@chromium.org
Review URL: http://codereview.chromium.org/7066003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index 6e6b3e0..65dac15 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -17,7 +17,6 @@ '../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:*', @@ -158,7 +157,6 @@ '../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', |