Move webkit_resources.gyp closer to its .grd file.

This is the GYP version. The GN change was done in
https://chromium.googlesource.com/chromium/src/+/4eebe74dc1fd6d3780180361f75707a6be33c3ce

BUG=400860
TEST=None
R=jamesr@chromium.org
TBR=ben@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#289602}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289602 0039d316-1c4b-4281-b951-d872f2087c98

android_webview/android_webview.gyp

@@ -67,7 +67,7 @@
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
-        '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
+        '<(DEPTH)/webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'actions': [
         {

athena/resources/athena_resources.gyp

@@ -33,7 +33,7 @@
         '../../extensions/extensions.gyp:extensions_shell_and_test_pak',
         '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
         '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
-        '../../webkit/webkit_resources.gyp:webkit_resources',
+        '../../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
         'athena_resources',
       ],
       'actions': [{

chrome/chrome_browser.gypi

@@ -2986,7 +2986,7 @@
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/storage_browser.gyp:webkit_storage_browser',
             '../webkit/storage_common.gyp:webkit_storage_common',
-            '../webkit/webkit_resources.gyp:webkit_resources',
+            '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
           ],
           'sources': [
             '<@(chrome_browser_non_ios_sources)',

chrome/chrome_browser_chromeos.gypi

@@ -103,7 +103,7 @@
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/storage_browser.gyp:webkit_storage_browser',
         '../webkit/storage_common.gyp:webkit_storage_common',
-        '../webkit/webkit_resources.gyp:webkit_resources',
+        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
         'chrome_resources.gyp:chrome_strings',
       ],
       'defines': [

chrome/chrome_browser_extensions.gypi

@@ -1007,7 +1007,7 @@
         '../url/url.gyp:url_lib',
         '../webkit/storage_browser.gyp:webkit_storage_browser',
         '../webkit/storage_common.gyp:webkit_storage_common',
-        '../webkit/webkit_resources.gyp:webkit_resources',
+        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',

chrome/chrome_browser_ui.gypi

@@ -2618,7 +2618,7 @@
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/storage_browser.gyp:webkit_storage_browser',
             '../webkit/storage_common.gyp:webkit_storage_common',
-            '../webkit/webkit_resources.gyp:webkit_resources',
+            '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
           ],
           'defines': [
             '<@(nacl_defines)',

chrome/chrome_dll.gypi

@@ -113,7 +113,7 @@
                 '../crypto/crypto.gyp:crypto',
                 '../net/net.gyp:net_resources',
                 '../ui/views/views.gyp:views',
-                '../webkit/webkit_resources.gyp:webkit_resources',
+                '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
               ],
               'sources': [
                 'app/chrome_command_ids.h',

chrome/chrome_renderer.gypi

@@ -302,7 +302,7 @@
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
         '../ui/surface/surface.gyp:surface',
-        '../webkit/webkit_resources.gyp:webkit_resources',
+        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',

chrome/chrome_resources.gyp

@@ -444,7 +444,7 @@
             '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
             '<(DEPTH)/content/content_resources.gyp:content_resources',
             '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
-            '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
+            '<(DEPTH)/webkit/glue/resources/webkit_resources.gyp:webkit_resources',
           ],
         }],
         ['use_ash==1', {

chrome/chrome_tests.gypi

@@ -36,7 +36,7 @@
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/base/ui_base.gyp:ui_base_test_support',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
-        '../webkit/webkit_resources.gyp:webkit_resources',
+        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',

chrome/chrome_tests_unit.gypi

@@ -2015,7 +2015,7 @@
             '../tools/json_schema_compiler/test/json_schema_compiler_tests.gyp:json_schema_compiler_tests',
             '../ui/gl/gl.gyp:gl',
             '../v8/tools/gyp/v8.gyp:v8',
-            '../webkit/webkit_resources.gyp:webkit_resources',
+            '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
           ],
           # TODO(scr): Use this in browser_tests too.
           'includes': [

chromecast/chromecast.gyp

@@ -81,7 +81,7 @@
         '../third_party/WebKit/public/blink_resources.gyp:blink_resources',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/strings/ui_strings.gyp:ui_strings',
-        '../webkit/webkit_resources.gyp:webkit_resources',
+        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'actions': [
         {

components/components_tests.gyp

@@ -873,7 +873,7 @@
                 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
                 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
                 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom',
-                '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
+                '<(DEPTH)/webkit/glue/resources/webkit_resources.gyp:webkit_resources',
               ],
               'configurations': {
                 'Debug_Base': {

content/content_browser.gypi

@@ -1603,7 +1603,7 @@
         '../webkit/common/webkit_common.gyp:webkit_common',
         '../webkit/storage_browser.gyp:webkit_storage_browser',
         '../webkit/storage_common.gyp:webkit_storage_common',
-        '../webkit/webkit_resources.gyp:webkit_resources',
+        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
     }],
     ['enable_printing!=0', {

content/content_child.gypi

@@ -327,7 +327,7 @@
         '../third_party/npapi/npapi.gyp:npapi',
         '../webkit/child/webkit_child.gyp:webkit_child',
         '../webkit/common/webkit_common.gyp:webkit_common',
-        '../webkit/webkit_resources.gyp:webkit_resources',
+        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
     }],
     ['use_aura==1', {

content/content_common.gypi

@@ -594,7 +594,7 @@
     }],
     ['OS=="mac"', {
       'dependencies': [
-        '../webkit/webkit_resources.gyp:webkit_resources',
+        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'sources': [
         'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc',

content/content_shell.gypi

@@ -63,7 +63,7 @@
         '../url/url.gyp:url_lib',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/storage_browser.gyp:webkit_storage_browser',
-        '../webkit/webkit_resources.gyp:webkit_resources',
+        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',
@@ -439,7 +439,7 @@
         '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
-        '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
+        '<(DEPTH)/webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'conditions': [
         ['OS!="android"', {

webkit/webkit_resources.gyp → webkit/glue/resources/webkit_resources.gyp

-# Copyright 2013 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.
 
@@ -13,15 +13,14 @@
       },
       'actions': [
         {
-          'action_name': 'webkit_resources',
+          'action_name': 'generate_webkit_resources',
           'variables': {
-            'grit_grd_file': 'glue/resources/webkit_resources.grd',
+            'grit_grd_file': 'webkit_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ '../../../build/grit_action.gypi' ],
         },
       ],
-      'includes': [ '../build/grit_target.gypi' ],
+      'includes': [ '../../../build/grit_target.gypi' ],
     },
   ]
 }
-