ash: Convert ash_resources to a normal GYP file.

ash/ash.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': {
     'chromium_code': 1,
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
-  'includes': [
-    'ash_resources.gypi',
-  ],
   'targets': [
     {
       'target_name': 'ash',
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../cc/cc.gyp:cc',
         '../content/content.gyp:content_browser',
@@ skipping 13 matching lines @@
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/strings/ui_strings.gyp:ui_strings',
         '../ui/views/controls/webview/webview.gyp:webview',
         '../ui/views/views.gyp:views',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
         '../ui/wm/wm.gyp:wm',
         '../url/url.gyp:url_lib',
+        'ash_resources.gyp:ash_resources',
         'ash_strings.gyp:ash_strings',
-        'ash_resources',
       ],
       'defines': [
         'ASH_IMPLEMENTATION',
       ],
       'sources': [
         # All .cc, .h under ash, except unittests
         'accelerators/accelerator_commands.cc',
         'accelerators/accelerator_commands.h',
         'accelerators/accelerator_controller.cc',
         'accelerators/accelerator_controller.h',
@@ skipping 698 matching lines @@
         '../ui/compositor/compositor.gyp:compositor',
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/strings/ui_strings.gyp:ui_strings',
         '../ui/views/controls/webview/webview.gyp:webview',
         '../ui/views/views.gyp:views',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
         '../url/url.gyp:url_lib',
+        'ash',
+        'ash_resources.gyp:ash_resources',
         'ash_strings.gyp:ash_strings',
-        'ash',
-        'ash_resources',
       ],
       'defines': [
         'ASH_WITH_CONTENT_IMPLEMENTATION',
       ],
       'sources': [
         'content_support/ash_with_content_export.h',
         'content_support/gpu_support_impl.cc',
         'content_support/gpu_support_impl.h',
         'screensaver/screensaver_view.cc',
         'screensaver/screensaver_view.h',
         'keyboard_overlay/keyboard_overlay_delegate.cc',
         'keyboard_overlay/keyboard_overlay_delegate.h',
         'keyboard_overlay/keyboard_overlay_view.cc',
         'keyboard_overlay/keyboard_overlay_view.h',
       ],
     },
     {
       'target_name': 'ash_test_support',
       'type': 'static_library',
       'dependencies': [
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../ui/accessibility/accessibility.gyp:ax_gen',
         '../ui/app_list/app_list.gyp:app_list_test_support',
         '../ui/views/views.gyp:views_test_support',
         'ash',
-        'ash_resources',
+        'ash_resources.gyp:ash_resources',
       ],
       'sources': [
         'desktop_background/desktop_background_controller_test_api.cc',
         'desktop_background/desktop_background_controller_test_api.h',
         'shell/keyboard_controller_proxy_stub.cc',
         'shell/keyboard_controller_proxy_stub.h',
         'shell/toplevel_window.cc',
         'shell/toplevel_window.h',
         'test/app_list_controller_test_api.cc',
         'test/app_list_controller_test_api.h',
@@ skipping 95 matching lines @@
         '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/message_center/message_center.gyp:message_center_test_support',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/views/controls/webview/webview_tests.gyp:webview_test_support',
         '../ui/views/views.gyp:views',
         '../ui/views/views.gyp:views_test_support',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
         '../ui/wm/wm.gyp:wm',
         '../url/url.gyp:url_lib',
+        'ash',
+        'ash_resources.gyp:ash_resources',
         'ash_strings.gyp:ash_strings',
-        'ash',
-        'ash_resources',
         'ash_test_support',
         'ash_with_content',
       ],
       'sources': [
         'accelerators/accelerator_commands_unittest.cc',
         'accelerators/accelerator_controller_unittest.cc',
         'accelerators/accelerator_filter_unittest.cc',
         'accelerators/accelerator_table_unittest.cc',
         'accelerators/magnifier_key_scroller_unittest.cc',
         'accelerators/spoken_feedback_toggler_unittest.cc',
@@ skipping 199 matching lines @@
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/views/examples/examples.gyp:views_examples_lib',
         '../ui/views/examples/examples.gyp:views_examples_with_content_lib',
         '../ui/views/views.gyp:views',
         '../ui/views/views.gyp:views_test_support',
         'ash',
-        'ash_resources',
+        'ash_resources.gyp:ash_resources',
         'ash_strings.gyp:ash_strings',
+        'ash_test_support',
         'ash_with_content',
-        'ash_test_support',
       ],
       'sources': [
         '../content/app/startup_helper_win.cc',
         '../ui/views/test/test_views_delegate_aura.cc',
         'shell/app_list.cc',
         'shell/bubble.cc',
         'shell/content_client/shell_browser_main_parts.cc',
         'shell/content_client/shell_browser_main_parts.h',
         'shell/content_client/shell_content_browser_client.cc',
         'shell/content_client/shell_content_browser_client.h',
@@ skipping 70 matching lines @@
       'conditions': [
         ['chromeos==1', {
           'dependencies': [
             '../ui/display/display.gyp:display',
           ],
         }],
       ],
     },
   ],
 }