Aura/ash split: Split the extra parts into ash and aura parts.

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.
 
 {
   'targets': [
     {
       'target_name': 'All',
       'type': 'none',
       'xcode_create_dependents_test_runner': 1,
@@ skipping 555 matching lines @@
           ],
         },
       ], # targets
     }], # "chromeos_gtk==1"
     ['use_aura==1', {
       'targets': [
         {
           'target_name': 'aura_builder',
           'type': 'none',
           'dependencies': [
-            '../ash/ash.gyp:ash_shell',
-            '../ash/ash.gyp:aura_shell_unittests',
             '../chrome/chrome.gyp:chrome',
             '../chrome/chrome.gyp:unit_tests',
             '../chrome/chrome.gyp:ui_tests',
             '../ui/aura/aura.gyp:*',
             '../ui/gfx/compositor/compositor.gyp:*',
             '../ui/views/views.gyp:views',
             '../ui/views/views.gyp:views_unittests',
             '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
           ],
           'conditions': [
             ['OS=="win"', {
               # Remove this when we have the real compositor.
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)',
                   'files': ['../third_party/directxsdk/files/dlls/D3DX10d_43.dll']
                 },
               ],
               'dependencies': [
                 '../chrome/chrome.gyp:crash_service',
                 '../chrome/chrome.gyp:crash_service_win64',
               ],
             }],
+            ['use_ash==1', {
+              'dependencies': [
+                '../ash/ash.gyp:ash_shell',
+                '../ash/ash.gyp:aura_shell_unittests',
+              ],
+            }],
             ['OS=="linux"', {
               # Tests that currently only work on Linux.
               'dependencies': [
                 '../base/base.gyp:base_unittests',
                 '../chrome/chrome.gyp:sync_unit_tests',
                 '../content/content.gyp:content_unittests',
                 '../ipc/ipc.gyp:ipc_tests',
                 '../sql/sql.gyp:sql_unittests',
                 '../ui/ui.gyp:gfx_unittests',
               ],
             }],
             ['OS=="mac"', {
               # Exclude dependencies that are not currently implemented.
               'dependencies!': [
                 '../chrome/chrome.gyp:chrome',
                 '../chrome/chrome.gyp:unit_tests',
                 '../chrome/chrome.gyp:ui_tests',
                 '../ui/views/views.gyp:views_unittests',
               ],
             }],
           ],
         },
       ],  # targets
     }], # "use_aura==1"
   ], # conditions
 }