Move webkit_resources / webkit_strings targets out of webkit_support.gyp

webkit/glue/webkit_glue.gypi

 # 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.
 
 {
   'target_defaults': {
      # Disable narrowing-conversion-in-initialization-list warnings in that we
      # do not want to fix it in data file "webcursor_gtk_data.h".
      'cflags+': ['-Wno-narrowing'],
      'cflags_cc+': ['-Wno-narrowing'],
   },
   'targets': [
     {
-      'target_name': 'webkit_resources',
-      'type': 'none',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
-      },
-      'actions': [
-        {
-          'action_name': 'webkit_resources',
-          'variables': {
-            'grit_grd_file': 'resources/webkit_resources.grd',
-          },
-          'includes': [ '../../build/grit_action.gypi' ],
-        },
-        {
-          'action_name': 'webkit_chromium_resources',
-          'variables': {
-            'grit_grd_file': '../../third_party/WebKit/Source/WebKit/chromium/WebKit.grd',
-          },
-          'includes': [ '../../build/grit_action.gypi' ],
-        },
-      ],
-      'includes': [ '../../build/grit_target.gypi' ],
-      'direct_dependent_settings': {
-        'include_dirs': [ '<(grit_out_dir)' ],
-      },
-    },
-    {
-      'target_name': 'webkit_strings',
-      'type': 'none',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
-      },
-      'actions': [
-        {
-          'action_name': 'webkit_strings',
-          'variables': {
-            'grit_grd_file': 'webkit_strings.grd',
-          },
-          'includes': [ '../../build/grit_action.gypi' ],
-        },
-      ],
-      'includes': [ '../../build/grit_target.gypi' ],
-    },
-
-    {
       'target_name': 'glue_child',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
         'WEBKIT_CHILD_IMPLEMENTATION',
       ],
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/skia/skia.gyp:skia',
@@ skipping 184 matching lines @@
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base',
         '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common',
         '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
         '<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser',
         '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
+        '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_resources',
+        '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
         'glue_common',
         'plugins',
         'webkit_common',
         'webkit_media',
-        'webkit_resources',
-        'webkit_strings',
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)/webkit',
         '<(SHARED_INTERMEDIATE_DIR)/ui',
       ],
       'sources': [
         'ftp_directory_listing_response_delegate.cc',
         'ftp_directory_listing_response_delegate.h',
         'network_list_observer.h',
@@ skipping 46 matching lines @@
                ],
                'export_dependent_settings': [
                  '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
                  '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
                ],
             }],
           ],
         }],
       ],
     },
+
+# TODO(jamesr): These temporary targets exist only for DumpRenderTree.gyp in the blink repo.
+    {
+      'target_name': 'webkit_resources',
+      'type': 'none',
+      'dependencies': [
+        '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_resources',
+      ],
+      'export_dependent_settings': [
+        '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_resources',
+      ],
+    },
+
+    {
+      'target_name': 'webkit_strings',
+      'type': 'none',
+      'dependencies': [
+        '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
+      ],
+      'export_dependent_settings': [
+        '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
+      ],
+    },
   ],
   'conditions': [
     ['use_third_party_translations==1', {
       'targets': [
         {
           'target_name': 'inspector_strings',
           'type': 'none',
           'variables': {
             'grit_out_dir': '<(PRODUCT_DIR)/resources/inspector/l10n',
           },
@@ skipping 18 matching lines @@
           'variables': {
             'jni_gen_package': 'webkit',
             'input_java_class': 'android/widget/OverScroller.class',
           },
           'includes': [ '../../build/jar_file_jni_generator.gypi' ],
         },
       ],
     }],
   ],
 }