Clean up app_shell GN build.

extensions/shell/app_shell.gyp

 # Copyright 2014 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': [
+    'app_shell.gypi',
+  ],
   'variables': {
     # Product name is used for Mac bundle.
     'app_shell_product_name': 'App Shell',
     # The version is high enough to be supported by Omaha (at least 31)
     # but fake enough to be obviously not a Chrome release.
     'app_shell_version': '38.1234.5678.9',
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 34 matching lines @@
       ],
       'export_dependent_settings': [
         '<(DEPTH)/content/content.gyp:content_browser',
       ],
       'include_dirs': [
         '../..',
         '<(SHARED_INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)/extensions/shell',
       ],
       'sources': [
-        'app/paths_mac.h',
-        'app/paths_mac.mm',
-        'app/shell_main_delegate.cc',
-        'app/shell_main_delegate.h',
-        'browser/api/identity/identity_api.cc',
-        'browser/api/identity/identity_api.h',
-        'browser/shell_browser_context_keyed_service_factories.cc',
-        'browser/shell_browser_context_keyed_service_factories.h',
-        'browser/default_shell_browser_main_delegate.cc',
-        'browser/default_shell_browser_main_delegate.h',
-        'browser/desktop_controller.cc',
-        'browser/desktop_controller.h',
-        'browser/media_capture_util.cc',
-        'browser/media_capture_util.h',
-        'browser/shell_app_delegate.cc',
-        'browser/shell_app_delegate.h',
-        'browser/shell_app_view_guest_delegate.cc',
-        'browser/shell_app_view_guest_delegate.h',
-        'browser/shell_app_window_client.cc',
-        'browser/shell_app_window_client.h',
-        'browser/shell_app_window_client_mac.mm',
-        'browser/shell_audio_controller_chromeos.cc',
-        'browser/shell_audio_controller_chromeos.h',
-        'browser/shell_browser_context.cc',
-        'browser/shell_browser_context.h',
-        'browser/shell_browser_main_delegate.h',
-        'browser/shell_browser_main_parts.cc',
-        'browser/shell_browser_main_parts.h',
-        'browser/shell_browser_main_parts_mac.h',
-        'browser/shell_browser_main_parts_mac.mm',
-        'browser/shell_content_browser_client.cc',
-        'browser/shell_content_browser_client.h',
-        'browser/shell_desktop_controller_mac.h',
-        'browser/shell_desktop_controller_mac.mm',
-        'browser/shell_device_client.cc',
-        'browser/shell_device_client.h',
-        'browser/shell_display_info_provider.cc',
-        'browser/shell_display_info_provider.h',
-        'browser/shell_extension_host_delegate.cc',
-        'browser/shell_extension_host_delegate.h',
-        'browser/shell_extension_system.cc',
-        'browser/shell_extension_system.h',
-        'browser/shell_extension_system_factory.cc',
-        'browser/shell_extension_system_factory.h',
-        'browser/shell_extension_web_contents_observer.cc',
-        'browser/shell_extension_web_contents_observer.h',
-        'browser/shell_extensions_api_client.cc',
-        'browser/shell_extensions_api_client.h',
-        'browser/shell_extensions_browser_client.cc',
-        'browser/shell_extensions_browser_client.h',
-        'browser/shell_native_app_window.cc',
-        'browser/shell_native_app_window.h',
-        'browser/shell_native_app_window_mac.h',
-        'browser/shell_native_app_window_mac.mm',
-        'browser/shell_network_controller_chromeos.cc',
-        'browser/shell_network_controller_chromeos.h',
-        'browser/shell_network_delegate.cc',
-        'browser/shell_network_delegate.h',
-        'browser/shell_oauth2_token_service.cc',
-        'browser/shell_oauth2_token_service.h',
-        'browser/shell_prefs.cc',
-        'browser/shell_prefs.h',
-        'browser/shell_runtime_api_delegate.cc',
-        'browser/shell_runtime_api_delegate.h',
-        'browser/shell_special_storage_policy.cc',
-        'browser/shell_special_storage_policy.h',
-        'browser/shell_speech_recognition_manager_delegate.cc',
-        'browser/shell_speech_recognition_manager_delegate.h',
-        'browser/shell_update_query_params_delegate.cc',
-        'browser/shell_update_query_params_delegate.h',
-        'browser/shell_url_request_context_getter.cc',
-        'browser/shell_url_request_context_getter.h',
-        'browser/shell_web_contents_modal_dialog_manager.cc',
-        'common/shell_content_client.cc',
-        'common/shell_content_client.h',
-        'common/shell_extensions_client.cc',
-        'common/shell_extensions_client.h',
-        'common/switches.cc',
-        'common/switches.h',
-        'renderer/shell_content_renderer_client.cc',
-        'renderer/shell_content_renderer_client.h',
-        'renderer/shell_extensions_renderer_client.cc',
-        'renderer/shell_extensions_renderer_client.h',
-        'utility/shell_content_utility_client.cc',
-        'utility/shell_content_utility_client.h',
+        '<@(app_shell_lib_sources)',
       ],
       'conditions': [
         ['use_aura==1', {
           'dependencies': [
             '<(DEPTH)/ui/wm/wm.gyp:wm',
           ],
           'sources': [
-            'browser/shell_app_window_client_aura.cc',
-            'browser/shell_desktop_controller_aura.cc',
-            'browser/shell_desktop_controller_aura.h',
-            'browser/shell_native_app_window_aura.cc',
-            'browser/shell_native_app_window_aura.h',
-            'browser/shell_screen.cc',
-            'browser/shell_screen.h',
+            '<@(app_shell_lib_sources_aura)',
           ],
         }],
         ['chromeos==1', {
           'dependencies': [
             '<(DEPTH)/chromeos/chromeos.gyp:chromeos',
             '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos',
             '<(DEPTH)/ui/display/display.gyp:display',
           ],
           'sources': [
-            'browser/api/shell_gcd/shell_gcd_api.cc',
-            'browser/api/shell_gcd/shell_gcd_api.h',
-            'browser/api/vpn_provider/vpn_service_factory.cc',
+            '<@(app_shell_lib_sources_chromeos)',
           ],
         }],
         ['disable_nacl==0 and OS=="linux"', {
           'dependencies': [
             '<(DEPTH)/components/nacl.gyp:nacl_helper',
           ],
         }],
         ['disable_nacl==0', {
           'dependencies': [
             '<(DEPTH)/components/nacl.gyp:nacl',
             '<(DEPTH)/components/nacl.gyp:nacl_browser',
             '<(DEPTH)/components/nacl.gyp:nacl_common',
             '<(DEPTH)/components/nacl.gyp:nacl_renderer',
             '<(DEPTH)/components/nacl.gyp:nacl_switches',
           ],
           'sources': [
-            'browser/shell_nacl_browser_delegate.cc',
-            'browser/shell_nacl_browser_delegate.h',
+            '<@(app_shell_lib_sources_nacl)',
           ],
         }],
       ],
     },
     {
       'target_name': 'app_shell',
       'type': 'executable',
       'mac_bundle': 1,
       'dependencies': [
         'app_shell_lib',
         '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak',
       ],
       'include_dirs': [
         '../..',
       ],
       'sources': [
-        'app/shell_main.cc',
+        '<@(app_shell_sources)',
       ],
       'conditions': [
         ['OS=="win"', {
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
             },
           },
           'dependencies': [
             '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
@@ skipping 82 matching lines @@
         'app_shell_lib',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/content/content.gyp:content_app_both',
         '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
         '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak',
         '<(DEPTH)/extensions/extensions.gyp:extensions_test_support',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'sources': [
-        '../test/extensions_unittests_main.cc',
-        'browser/api/identity/identity_api_unittest.cc',
-        'browser/shell_oauth2_token_service_unittest.cc',
-        'browser/shell_prefs_unittest.cc',
-        'common/shell_content_client_unittest.cc'
+        '<@(app_shell_unittests_sources)',
       ],
       'conditions': [
         ['disable_nacl==0', {
           'sources': [
-            'browser/shell_nacl_browser_delegate_unittest.cc',
+            '<@(app_shell_unittests_sources_nacl)',
           ],
         }],
         ['use_aura==1', {
           'sources': [
-            'browser/shell_desktop_controller_aura_unittest.cc',
-            'browser/shell_native_app_window_aura_unittest.cc',
-            'browser/shell_screen_unittest.cc',
+            '<@(app_shell_unittests_sources_aura)',
           ],
           'dependencies': [
             '<(DEPTH)/ui/aura/aura.gyp:aura_test_support',
           ],
         }],
         ['chromeos==1', {
           'dependencies': [
             '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
           ],
           'sources': [
-            'browser/api/shell_gcd/shell_gcd_api_unittest.cc',
-            'browser/shell_audio_controller_chromeos_unittest.cc',
+            '<@(app_shell_unittests_sources_chromeos)',
           ],
         }],
         ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ],
         }],
       ],
     },
     {
@@ skipping 63 matching lines @@
 
             'INFOPLIST_FILE': 'app/framework-Info.plist',
           },
           'dependencies': [
             'app_shell_lib',
           ],
           'include_dirs': [
             '../..',
           ],
           'sources': [
-            'app/shell_main_mac.h',
-            'app/shell_main_mac.cc',
+            '<@(app_shell_sources_mac)',
           ],
           'postbuilds': [
             {
               # Modify the Info.plist as needed.  The script explains why
               # this is needed.  This is also done in the chrome target.
               # The framework needs the Breakpad keys if this feature is
               # enabled.  It does not need the Keystone keys; these always
               # come from the outer application bundle.  The framework
               # doesn't currently use the SCM keys for anything,
               # but this seems like a really good place to store them.
@@ skipping 83 matching lines @@
               'action': [
                 '../../build/mac/verify_no_objc.sh',
               ],
             },
           ],
         },  # target app_shell_helper
       ],
     }],  # OS=="mac"
   ],
 }