Attempt to fix all.gyp again, take #2.

build/all.gyp

 # Copyright (c) 2012 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': {
     # A hook that can be overridden in other repositories to add additional
     # compilation targets to 'All'.
     'app_targets%': [],
     # For Android-specific targets.
@@ skipping 449 matching lines @@
             '../mojo/mojo_nacl_untrusted.gyp:libmojo',
             '../mojo/mojo_nacl.gyp:monacl_codegen',
             '../mojo/mojo_nacl.gyp:monacl_sel',
             '../mojo/mojo_nacl.gyp:monacl_shell',
           ],
         }],
       ],
     }, # target_name: chromium_builder_tests
   ],
   'conditions': [
-    # TODO(GYP) - make gyp_all and gn_all work on iOS and Android also.
+    ['OS!="ios"', {
+      'targets': [
+        {
+          'target_name': 'blink_tests',
+          'type': 'none',
+          'dependencies': [
+            '../third_party/WebKit/public/all.gyp:all_blink',
+          ],
+          'conditions': [
+            ['OS=="android"', {
+              'dependencies': [
+                '../content/content_shell_and_tests.gyp:content_shell_apk',
+                '../breakpad/breakpad.gyp:dump_syms#host',
+                '../breakpad/breakpad.gyp:minidump_stackwalk#host',
+              ],
+            }, {  # OS!="android"
+              'dependencies': [
+                '../content/content_shell_and_tests.gyp:content_shell',
+              ],
+            }],
+            ['OS=="win"', {
+              'dependencies': [
+                '../content/content_shell_and_tests.gyp:content_shell_crash_service',
+                '../content/content_shell_and_tests.gyp:layout_test_helper',
+              ],
+            }],
+            ['OS!="win" and OS!="android"', {
+              'dependencies': [
+                '../breakpad/breakpad.gyp:minidump_stackwalk',
+              ],
+            }],
+            ['OS=="mac"', {
+              'dependencies': [
+                '../breakpad/breakpad.gyp:dump_syms#host',
+                '../content/content_shell_and_tests.gyp:layout_test_helper',
+              ],
+            }],
+            ['OS=="linux"', {
+              'dependencies': [
+                '../breakpad/breakpad.gyp:dump_syms',
+              ],
+            }],
+          ],
+        }, # target_name: blink_tests
+      ],
+    }], # OS!=ios
     ['OS!="ios" and OS!="android"', {
       'targets': [
         {
+          # TODO(GYP) - make gyp_all and gn_all work on iOS and Android also.
           'target_name': 'gyp_all',
           'type': 'none',
           'dependencies': [
             ':gn_all',
             '../chrome/chrome.gyp:chromedriver_unittests',
             '../components/components_tests.gyp:components_browsertests',
             # '../components/nacl.gyp:nacl_loader_unittests',  # TODO(GYP)
             # '../remoting/remoting.gyp:remoting_unittests',  # TODO(GYP)
             '../ui/compositor/compositor.gyp:compositor_unittests',
           ],
@@ skipping 129 matching lines @@
               ],
             }],
             ['OS=="linux"', {
               'dependencies': [
                 '../dbus/dbus.gyp:dbus_unittests',
                 '../sandbox/sandbox.gyp:sandbox_linux_unittests',
               ],
             }],
           ],
         },
-      ]},
-    ], # OS!="ios" and OS!="android"
-    ['OS!="iOS"', {
-      'targets': [
-        {
-          'target_name': 'blink_tests',
-          'type': 'none',
-          'dependencies': [
-            '../third_party/WebKit/public/all.gyp:all_blink',
-          ],
-          'conditions': [
-            ['OS=="android"', {
-              'dependencies': [
-                '../content/content_shell_and_tests.gyp:content_shell_apk',
-                '../breakpad/breakpad.gyp:dump_syms#host',
-                '../breakpad/breakpad.gyp:minidump_stackwalk#host',
-              ],
-            }, {  # OS!="android"
-              'dependencies': [
-                '../content/content_shell_and_tests.gyp:content_shell',
-              ],
-            }],
-            ['OS=="win"', {
-              'dependencies': [
-                '../content/content_shell_and_tests.gyp:content_shell_crash_service',
-                '../content/content_shell_and_tests.gyp:layout_test_helper',
-              ],
-            }],
-            ['OS!="win" and OS!="android"', {
-              'dependencies': [
-                '../breakpad/breakpad.gyp:minidump_stackwalk',
-              ],
-            }],
-            ['OS=="mac"', {
-              'dependencies': [
-                '../breakpad/breakpad.gyp:dump_syms#host',
-                '../content/content_shell_and_tests.gyp:layout_test_helper',
-              ],
-            }],
-            ['OS=="linux"', {
-              'dependencies': [
-                '../breakpad/breakpad.gyp:dump_syms',
-              ],
-            }],
-          ],
-        }, # target_name: blink_tests
-      ],
-    }], # OS!=ios
-    ['OS!="ios" and OS!="android"', {
-      'targets': [
-        {
+      ]},{
           'target_name': 'chromium_builder_nacl_win_integration',
           'type': 'none',
           'dependencies': [
             'chromium_builder_tests',
           ],
         }, # target_name: chromium_builder_nacl_win_integration
         {
           'target_name': 'chromium_builder_perf',
           'type': 'none',
           'dependencies': [
@@ skipping 794 matching lines @@
           'dependencies': [
             '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
             '../ui/views/views.gyp:views',
             '../ui/views/views.gyp:views_unittests',
           ],
         },  # target_name: macviews_builder
       ],  # targets
     }],  # os=='mac' and toolkit_views==1
   ],  # conditions
 }