ash: Convert ash_resources to a normal GYP file.

It seems to be much more common to have this kind of resources file as a
normal GYP file rather than an *include* GYP file.

$ git ls-files | grep resources.gyp$ | grep -v ash_resources | wc -l
9

vs

$ git ls-files | grep resources.gypi$ | grep -v ash_resources | wc -l
3

BUG=None
TEST=None
R=jamescook@chromium.org
NOTRY=true
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/307993007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274130 0039d316-1c4b-4281-b951-d872f2087c98

ash/ash.gyp

@@ -7,9 +7,6 @@
     'chromium_code': 1,
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
-  'includes': [
-    'ash_resources.gypi',
-  ],
   'targets': [
     {
       'target_name': 'ash',
@@ -43,8 +40,8 @@
         '../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',
@@ -763,9 +760,9 @@
         '../ui/views/views.gyp:views',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
         '../url/url.gyp:url_lib',
-        'ash_strings.gyp:ash_strings',
         'ash',
-        'ash_resources',
+        'ash_resources.gyp:ash_resources',
+        'ash_strings.gyp:ash_strings',
       ],
       'defines': [
         'ASH_WITH_CONTENT_IMPLEMENTATION',
@@ -792,7 +789,7 @@
         '../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',
@@ -908,9 +905,9 @@
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
         '../ui/wm/wm.gyp:wm',
         '../url/url.gyp:url_lib',
-        'ash_strings.gyp:ash_strings',
         'ash',
-        'ash_resources',
+        'ash_resources.gyp:ash_resources',
+        'ash_strings.gyp:ash_strings',
         'ash_test_support',
         'ash_with_content',
       ],
@@ -1130,10 +1127,10 @@
         '../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_with_content',
         'ash_test_support',
+        'ash_with_content',
       ],
       'sources': [
         '../content/app/startup_helper_win.cc',

ash/ash_resources.gypi → ash/ash_resources.gyp

-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# 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.
 

chrome/chrome_browser_chromeos.gypi

@@ -1061,7 +1061,7 @@
           'dependencies': [
             '../ash/ash.gyp:ash',
             '../ash/ash.gyp:ash_with_content',
-            '../ash/ash.gyp:ash_resources',
+            '../ash/ash_resources.gyp:ash_resources',
             '../ash/ash_strings.gyp:ash_strings',
             '../ui/app_list/app_list.gyp:app_list',
             '../ui/message_center/message_center.gyp:message_center',

chrome/chrome_browser_ui.gypi

@@ -2712,7 +2712,7 @@
           ],
           'dependencies': [
             # aura uses some of ash resources.
-            '../ash/ash.gyp:ash_resources',
+            '../ash/ash_resources.gyp:ash_resources',
             '../ui/aura/aura.gyp:aura',
             '../ui/keyboard/keyboard.gyp:keyboard',
             '../ui/keyboard/keyboard.gyp:keyboard_resources',

chrome/chrome_resources.gyp

@@ -427,8 +427,8 @@
         }],
         ['use_ash==1', {
           'dependencies': [
+             '<(DEPTH)/ash/ash_resources.gyp:ash_resources',
              '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
-             '<(DEPTH)/ash/ash.gyp:ash_resources',
           ],
         }],
         ['enable_autofill_dialog==1 and OS!="android"', {

chrome/chrome_tests.gypi

@@ -260,7 +260,7 @@
         }],
         ['chromeos==1', {
           'dependencies': [
-            '../ash/ash.gyp:ash_resources',
+            '../ash/ash_resources.gyp:ash_resources',
             '../chromeos/chromeos.gyp:chromeos',
           ],
           'conditions': [

chrome/chrome_tests_unit.gypi

@@ -2124,8 +2124,8 @@
             'browser/ui/app_list/search/tokenized_string_unittest.cc',
           ],
           'dependencies': [
-            '../ash/ash.gyp:ash_resources',
             '../ash/ash.gyp:ash_test_support',
+            '../ash/ash_resources.gyp:ash_resources',
             '../ash/ash_strings.gyp:ash_strings',
           ],
           # We eventually want to compile both in Win Aura builds, see
@@ -2286,7 +2286,7 @@
         }],
         ['chromeos==1', {
           'dependencies': [
-            '../ash/ash.gyp:ash_resources',
+            '../ash/ash_resources.gyp:ash_resources',
           ],
           'sources!': [
             'browser/extensions/api/messaging/native_message_process_host_unittest.cc',