Conditionally add the OpenGL ES 2.0 conformance tests to all.gyp

This is a step to getting the OpenGL ES 2.0 conformance tests
running on the gpu bots. Actually running them will be another CL or 2.

TEST=they build
BUG=none

Review URL: https://chromiumcodereview.appspot.com/10796101

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148023 0039d316-1c4b-4281-b951-d872f2087c98

build/all.gyp

@@ -307,6 +307,13 @@
             '../chrome/chrome.gyp:performance_ui_tests',
             '../gpu/gpu.gyp:gl_tests',
           ],
+          'conditions': [
+            ['internal_gles2_conform_tests', {
+              'dependencies': [
+                '../gpu/gles2_conform_test/gles2_conform_test.gyp:gles2_conform_test_windowless',
+              ],
+            }], # internal_gles2_conform
+          ],
         }, # target_name: chromium_gpu_builder
         {
           'target_name': 'chromium_gpu_debug_builder',
@@ -315,6 +322,13 @@
             '../chrome/chrome.gyp:gpu_tests',
             '../gpu/gpu.gyp:gl_tests',
           ],
+          'conditions': [
+            ['internal_gles2_conform_tests', {
+              'dependencies': [
+                '../gpu/gles2_conform_test/gles2_conform_test.gyp:gles2_conform_test_windowless',
+              ],
+            }], # internal_gles2_conform
+          ],
         }, # target_name: chromium_gpu_debug_builder
         {
           'target_name': 'chromium_builder_qa',

build/common.gypi

@@ -786,6 +786,9 @@
     # Set to 1 to compile with the built in pdf viewer.
     'internal_pdf%': 0,
 
+    # Set to 1 to compile with the OpenGL ES 2.0 conformance tests.
+    'internal_gles2_conform_tests%': 0,
+
     # NOTE: When these end up in the Mac bundle, we need to replace '-' for '_'
     # so Cocoa is happy (http://crbug.com/20441).
     'locales': [