diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 19:37:35 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 19:37:35 +0000 |
| commit | 7d36dcaef8f2a5c030ec5402e3fbe1f515a6d737 (patch) | |
| tree | 3d6708b1b44ea3049aae78202bfc50b10d1f283a /build | |
| parent | d10740b13a3c2481b06539206bcb903bcf307fd4 (diff) | |
| download | chromium_src-7d36dcaef8f2a5c030ec5402e3fbe1f515a6d737.zip chromium_src-7d36dcaef8f2a5c030ec5402e3fbe1f515a6d737.tar.gz chromium_src-7d36dcaef8f2a5c030ec5402e3fbe1f515a6d737.tar.bz2 | |
Resubmit CL 86306
TEST=ran locally
BUG=83382
Review URL: http://codereview.chromium.org/7066028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 2 |
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', |