diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 06:35:21 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 06:35:21 +0000 |
| commit | 3c0edf1d82131458b0aa7c5115a53e62a6421f21 (patch) | |
| tree | 1ea30c39763a51a590e0d0abb47080447f18fed1 /webkit/gpu | |
| parent | 6954b285be656e38ed8462c8b296c3a8576193e8 (diff) | |
| download | chromium_src-3c0edf1d82131458b0aa7c5115a53e62a6421f21.zip chromium_src-3c0edf1d82131458b0aa7c5115a53e62a6421f21.tar.gz chromium_src-3c0edf1d82131458b0aa7c5115a53e62a6421f21.tar.bz2 | |
Revert r118525 / Re-land r118240 - the build failure was a flake.
This change re-enables building gles2_c_lib as a component.
TBR=gman@chromium.org
BUG=107735
TEST=waterfall stays green
Review URL: https://chromiumcodereview.appspot.com/9150022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
| -rw-r--r-- | webkit/gpu/webkit_gpu.gypi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/gpu/webkit_gpu.gypi b/webkit/gpu/webkit_gpu.gypi index a342636..d828760 100644 --- a/webkit/gpu/webkit_gpu.gypi +++ b/webkit/gpu/webkit_gpu.gypi @@ -10,9 +10,10 @@ 'variables': { 'enable_wexit_time_destructors': 1, }, 'dependencies': [ '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/gpu/gpu.gyp:command_buffer_service', - '<(DEPTH)/gpu/gpu.gyp:command_buffer_client', - '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', + '<(DEPTH)/gpu/gpu.gyp:command_buffer_service', + '<(DEPTH)/gpu/gpu.gyp:command_buffer_client', + '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', + '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', '<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_glsl', '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', ], |