Isolate gl_unittests_apk.

ui/gl/gl_tests.gyp

 # Copyright 2015 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 49 matching lines @@
           'type': 'none',
           'dependencies': [
             'gl_unittests',
           ],
           'variables': {
             'test_suite_name': 'gl_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },
       ],
+      'conditions': [
+        ['test_isolation_mode != "noop"',
+          {
+            'targets': [
+              {
+                'target_name': 'gl_unittests_apk_run',
+                'type': 'none',
+                'dependencies': [
+                  'gl_unittests_apk',
+                ],
+                'includes': [
+                  '../../build/isolate.gypi',
+                ],
+                'sources': [
+                  'gl_unittests_apk.isolate',

[jbudorick, 2015/10/13 05:03:48]

This file doesn't exist and isn't in this CL at the moment.

+                ],
+              },
+            ]
+          }
+        ],
+      ],
     }],
-    ['test_isolation_mode != "noop"', {
+    ['test_isolation_mode != "noop" and OS != "android"', {
       'targets': [
         {
           'target_name': 'gl_unittests_run',
           'type': 'none',
           'dependencies': [
             'gl_unittests',
           ],
           'includes': [
             '../../build/isolate.gypi',
           ],
           'sources': [
             'gl_unittests.isolate',
           ],
           'conditions': [
             ['use_x11 == 1', {
               'dependencies': [
                 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }