| Index: build/all.gyp
 | 
| diff --git a/build/all.gyp b/build/all.gyp
 | 
| index 65dac15bdbac9399772d470650cffad70ba2077c..6e6b3e0be14d2ebbafc1766edee0081a9608ad1f 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',
 | 
| 
 |