Put GPU isolate targets under archive_gpu_tests=1 GYP variable.

chrome/chrome_tests.gypi

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'includes': [
     'js_unittest_vars.gypi',
   ],
   'targets': [
     {
       'target_name': 'interactive_ui_tests',
@@ skipping 2809 matching lines @@
             '../sync/sync.gyp:sync_java',
             '../sync/sync.gyp:sync_java_test_support',
           ],
           'includes': [ '../build/java.gypi' ],
         },
       ],
     }],
     ['test_isolation_mode != "noop"', {
       'targets': [
         {
-          'target_name': 'angle_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            '../gpu/gpu.gyp:angle_unittests',
-          ],
-          'includes': [
-            '../build/isolate.gypi',
-            'angle_unittests.isolate',
-          ],
-          'sources': [
-            'angle_unittests.isolate',
-          ],
-        },
-        {
           'target_name': 'browser_tests_run',
           'type': 'none',
           'dependencies': [
             '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin',
             'browser_tests',
             'chrome',
           ],
           'includes': [
             '../build/isolate.gypi',
             'browser_tests.isolate',
           ],
           'sources': [
             'browser_tests.isolate',
           ],
           'conditions': [
             ['use_x11==1', {
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
         {
-          'target_name': 'content_gl_tests_run',
-          'type': 'none',
-          'dependencies': [
-            '../content/content_shell_and_tests.gyp:content_gl_tests',
-            'chrome_run',
-          ],
-          'includes': [
-            '../build/isolate.gypi',
-            'content_gl_tests.isolate',
-          ],
-          'sources': [
-            'content_gl_tests.isolate',
-          ],
-        },
-        {
-          'target_name': 'gl_tests_run',
-          'type': 'none',
-          'dependencies': [
-            '../gpu/gpu.gyp:gl_tests',
-          ],
-          'includes': [
-            '../build/isolate.gypi',
-            'gl_tests.isolate',
-          ],
-          'sources': [
-            'gl_tests.isolate',
-          ],
-        },
-        {
           'target_name': 'interactive_ui_tests_run',
           'type': 'none',
           'dependencies': [
             'interactive_ui_tests',
           ],
           'conditions': [
             ['use_x11 == 1', {
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
@@ skipping 22 matching lines @@
           ],
           'includes': [
             '../build/isolate.gypi',
             'sync_integration_tests.isolate',
           ],
           'sources': [
             'sync_integration_tests.isolate',
           ],
         },
         {
-          'target_name': 'tab_capture_end2end_tests_run',
-          'type': 'none',
-          'dependencies': [
-            'browser_tests_run',
-          ],
-          'includes': [
-            '../build/isolate.gypi',
-            'tab_capture_end2end_tests.isolate',
-          ],
-          'sources': [
-            'tab_capture_end2end_tests.isolate',
-          ],
-        },
-        {
           'target_name': 'tab_capture_performance_tests_run',
           'type': 'none',
           'dependencies': [
             'performance_browser_tests',
             'chrome_run',
           ],
           'includes': [
             '../build/isolate.gypi',
             'tab_capture_performance_tests.isolate',
           ],
           'sources': [
             'tab_capture_performance_tests.isolate',
           ],
         },
-        {
-          'target_name': 'telemetry_gpu_test_run',
-          'type': 'none',
-          'dependencies': [
-            'chrome_run',
-            '../tools/telemetry/telemetry.gyp:bitmaptools#host',
+      ],
+      'conditions': [
+        ['archive_gpu_tests==1', {
+          'targets': [
+            {
+              'target_name': 'angle_unittests_run',
+              'type': 'none',
+              'dependencies': [
+                '../gpu/gpu.gyp:angle_unittests',
+              ],
+              'includes': [
+                '../build/isolate.gypi',
+                'angle_unittests.isolate',
+              ],
+              'sources': [
+                'angle_unittests.isolate',
+              ],
+            },
+            {
+              'target_name': 'content_gl_tests_run',
+              'type': 'none',
+              'dependencies': [
+                '../content/content_shell_and_tests.gyp:content_gl_tests',
+                'chrome_run',
+              ],
+              'includes': [
+                '../build/isolate.gypi',
+                'content_gl_tests.isolate',
+              ],
+              'sources': [
+                'content_gl_tests.isolate',
+              ],
+            },
+            {
+              'target_name': 'gl_tests_run',
+              'type': 'none',
+              'dependencies': [
+                '../gpu/gpu.gyp:gl_tests',
+              ],
+              'includes': [
+                '../build/isolate.gypi',
+                'gl_tests.isolate',
+              ],
+              'sources': [
+                'gl_tests.isolate',
+              ],
+            },
+            {
+              'target_name': 'tab_capture_end2end_tests_run',
+              'type': 'none',
+              'dependencies': [
+                'browser_tests_run',
+              ],
+              'includes': [
+                '../build/isolate.gypi',
+                'tab_capture_end2end_tests.isolate',
+              ],
+              'sources': [
+                'tab_capture_end2end_tests.isolate',
+              ],
+            },
+            {
+              'target_name': 'telemetry_gpu_test_run',
+              'type': 'none',
+              'dependencies': [
+                'chrome_run',
+                '../tools/telemetry/telemetry.gyp:bitmaptools#host',
+              ],
+              'includes': [
+                '../build/isolate.gypi',
+                'telemetry_gpu_test.isolate',
+              ],
+              'sources': [
+                'telemetry_gpu_test.isolate',
+              ],
+            },
           ],
-          'includes': [
-            '../build/isolate.gypi',
-            'telemetry_gpu_test.isolate',
+          'conditions': [
+            ['internal_gles2_conform_tests==1', {
+              'targets': [
+                {
+                  'target_name': 'gles2_conform_test_run',
+                  'type': 'none',
+                  'dependencies': [
+                    '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test',
+                  ],
+                  'includes': [
+                    '../build/isolate.gypi',
+                    'gles2_conform_test.isolate',
+                  ],
+                  'sources': [
+                    'gles2_conform_test.isolate',
+                  ],
+                },
+              ],
+            }],
           ],
-          'sources': [
-            'telemetry_gpu_test.isolate',
-          ],
-        },
-      ],
-    }],
-    ['test_isolation_mode != "noop" and internal_gles2_conform_tests==1', {
-      'targets': [
-        {
-          'target_name': 'gles2_conform_test_run',
-          'type': 'none',
-          'dependencies': [
-            '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test',
-          ],
-          'includes': [
-            '../build/isolate.gypi',
-            'gles2_conform_test.isolate',
-          ],
-          'sources': [
-            'gles2_conform_test.isolate',
-          ],
-        },
+        }],
       ],
     }],
     [ 'enable_mdns == 1', {
       'targets': [{
           'target_name': 'service_discovery_sniffer',
           'type': 'executable',
           'dependencies': [
             '../net/net.gyp:net',
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             'utility',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
           ],
           'conditions': [
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
               ]
             }],
           ],
         }]
     }],
   ],  # 'conditions'
 }