webkit: Refactor webkit_renderer.gypi into a gyp file.

This moves webkit_renderer from an 'include' gyp file to a standalone gyp file.
This also moves it out of webkit_support.gyp, to avoid creating circular
dependencies between gyp files. To do this, glue_common target was also moved
into a gyp file.

BUG=None
TBR=jamesr@chromium.org

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

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

11 files changed, 84 insertions, 79 deletions

diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index 5090d7c..987fe59 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -19,7 +19,7 @@
         '../../skia/skia.gyp:skia',
         '../../ui/ui.gyp:ui',
         '../../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
-        '../../webkit/support/webkit_support.gyp:glue_common',
+        '../../webkit/glue/webkit_glue_common.gyp:glue_common',
         '../../webkit/storage_browser.gyp:webkit_storage_browser',
         '../../webkit/storage_common.gyp:webkit_storage_common',
         'android_webview_native_jni',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ebde7ae..eed36e8 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2408,10 +2408,10 @@
             '../ui/surface/surface.gyp:surface',
             '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
             '../v8/tools/gyp/v8.gyp:v8',
+            '../webkit/glue/webkit_glue_common.gyp:glue_common',
             '../webkit/plugins/webkit_plugins.gyp:plugins_common',
             '../webkit/storage_browser.gyp:webkit_storage_browser',
             '../webkit/storage_common.gyp:webkit_storage_common',
-            '../webkit/support/webkit_support.gyp:glue_common',
             '../webkit/webkit_resources.gyp:webkit_resources',
           ],
           'defines': [
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index d82c3ef..897e0f8 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -27,11 +27,11 @@
         '../third_party/WebKit/public/blink.gyp:blink',
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
         '../ui/surface/surface.gyp:surface',
+        '../webkit/glue/webkit_glue_common.gyp:glue_common',
+        '../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
         '../webkit/support/webkit_support.gyp:glue',
-        '../webkit/support/webkit_support.gyp:glue_common',
         '../webkit/support/webkit_support.gyp:plugins',
         '../webkit/support/webkit_support.gyp:webkit_media',
-        '../webkit/support/webkit_support.gyp:webkit_renderer',
         '../webkit/webkit_resources.gyp:webkit_resources',
       ],
       'include_dirs': [
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 458384b..8c651cd 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -18,17 +18,17 @@
     '../v8/tools/gyp/v8.gyp:v8',
     '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
     '../webkit/common/webkit_common.gyp:webkit_common',
+    '../webkit/glue/webkit_glue_common.gyp:glue_common',
+    '../webkit/plugins/webkit_plugins.gyp:plugins_common',
     '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
     '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
-    '../webkit/plugins/webkit_plugins.gyp:plugins_common',
-    '../webkit/storage_renderer.gyp:webkit_storage_renderer',
+    '../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
     '../webkit/storage_common.gyp:webkit_storage_common',
+    '../webkit/storage_renderer.gyp:webkit_storage_renderer',
     '../webkit/support/webkit_support.gyp:glue',
     '../webkit/support/webkit_support.gyp:glue_child',
-    '../webkit/support/webkit_support.gyp:glue_common',
     '../webkit/support/webkit_support.gyp:plugins',
     '../webkit/support/webkit_support.gyp:webkit_media',
-    '../webkit/support/webkit_support.gyp:webkit_renderer',
   ],
   'include_dirs': [
     '..',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 7df6d90b..608cc48 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -586,17 +586,17 @@
             '../ui/gl/gl.gyp:gl',
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/common/webkit_common.gyp:webkit_common',
+            '../webkit/glue/webkit_glue_common.gyp:glue_common',
             '../webkit/plugins/webkit_plugins.gyp:plugins_common',
             '../webkit/plugins/webkit_plugins.gyp:test_mock_plugin_list',
+            '../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
             '../webkit/storage_browser.gyp:webkit_storage_browser',
             '../webkit/storage_common.gyp:webkit_storage_common',
             '../webkit/storage_renderer.gyp:webkit_storage_renderer',
             '../webkit/support/webkit_support.gyp:glue',
             '../webkit/support/webkit_support.gyp:glue_child',
-            '../webkit/support/webkit_support.gyp:glue_common',
             '../webkit/support/webkit_support.gyp:plugins',
             '../webkit/support/webkit_support.gyp:webkit_media',
-            '../webkit/support/webkit_support.gyp:webkit_renderer',
           ],
         }],
         ['enable_plugins==0', {
@@ -766,9 +766,9 @@
             '../ui/snapshot/snapshot.gyp:snapshot',
             '../ui/ui.gyp:shell_dialogs',
             '../ui/ui.gyp:ui',
+            '../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
             '../webkit/support/webkit_support.gyp:glue',
             '../webkit/support/webkit_support.gyp:glue_child',
-            '../webkit/support/webkit_support.gyp:webkit_renderer',
           ],
           'include_dirs': [
             '..',
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 60b154f..a12d4c6 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -84,67 +84,6 @@
       ],
     },
 
-    {
-      'target_name': 'glue_common',
-      'type': '<(component)',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'defines': [
-        'WEBKIT_COMMON_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/base.gyp:base_i18n',
-        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
-        '<(DEPTH)/ui/ui.gyp:ui',
-        '<(DEPTH)/ui/ui.gyp:ui_resources',
-        '<(DEPTH)/url/url.gyp:url_lib',
-      ],
-
-      'sources': [
-        '../common/webkit_common_export.h',
-        '../common/webmenuitem.cc',
-        '../common/webmenuitem.h',
-        '../common/webpreferences.cc',
-        '../common/webpreferences.h',
-        'multipart_response_delegate.cc',
-        'multipart_response_delegate.h',
-        'weburlrequest_extradata_impl.cc',
-        'weburlrequest_extradata_impl.h',
-        'weburlresponse_extradata_impl.cc',
-        'weburlresponse_extradata_impl.h',
-      ],
-
-      'conditions': [
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '<(DEPTH)/build/linux/system.gyp:gtk',
-          ],
-          'sources/': [['exclude', '_x11\\.cc$']],
-        }],
-        ['OS!="mac"', {
-          'sources/': [['exclude', '_mac\\.(cc|mm)$']],
-        }, {  # else: OS=="mac"
-          'link_settings': {
-            'libraries': [
-              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
-            ],
-          },
-        }],
-        ['OS!="win"', {
-          'sources/': [['exclude', '_win\\.cc$']],
-        }, {  # else: OS=="win"
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [ 4800, 4267 ],
-          'sources/': [['exclude', '_posix\\.cc$']],
-          'include_dirs': [
-            '<(DEPTH)/third_party/wtl/include',
-          ],
-        }],
-      ],
-    },
 
     {
       'target_name': 'glue',
@@ -174,13 +113,13 @@
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
+        '<(DEPTH)/webkit/glue/webkit_glue_common.gyp:glue_common',
         '<(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_resources',
         '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
-        'glue_common',
         'plugins',
         'webkit_media',
       ],
diff --git a/webkit/glue/webkit_glue_common.gyp b/webkit/glue/webkit_glue_common.gyp
new file mode 100644
index 0000000..c3db7cd
--- /dev/null
+++ b/webkit/glue/webkit_glue_common.gyp
@@ -0,0 +1,67 @@
+# Copyright 2013 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'glue_common',
+      'type': '<(component)',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'defines': [
+        'WEBKIT_COMMON_IMPLEMENTATION',
+      ],
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/base.gyp:base_i18n',
+        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
+        '<(DEPTH)/ui/ui.gyp:ui',
+        '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/url/url.gyp:url_lib',
+      ],
+      'sources': [
+        '../common/webkit_common_export.h',
+        '../common/webmenuitem.cc',
+        '../common/webmenuitem.h',
+        '../common/webpreferences.cc',
+        '../common/webpreferences.h',
+        'multipart_response_delegate.cc',
+        'multipart_response_delegate.h',
+        'weburlrequest_extradata_impl.cc',
+        'weburlrequest_extradata_impl.h',
+        'weburlresponse_extradata_impl.cc',
+        'weburlresponse_extradata_impl.h',
+      ],
+      'conditions': [
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '<(DEPTH)/build/linux/system.gyp:gtk',
+          ],
+          'sources/': [['exclude', '_x11\\.cc$']],
+        }],
+        ['OS!="mac"', {
+          'sources/': [['exclude', '_mac\\.(cc|mm)$']],
+        }, {  # else: OS=="mac"
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+            ],
+          },
+        }],
+        ['OS!="win"', {
+          'sources/': [['exclude', '_win\\.cc$']],
+        }, {  # else: OS=="win"
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4800, 4267 ],
+          'sources/': [['exclude', '_posix\\.cc$']],
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+        }],
+      ],
+    },
+  ],
+}
diff --git a/webkit/plugins/webkit_plugins.gypi b/webkit/plugins/webkit_plugins.gypi
index ddb5814..dcf212e 100644
--- a/webkit/plugins/webkit_plugins.gypi
+++ b/webkit/plugins/webkit_plugins.gypi
@@ -37,10 +37,10 @@
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
+        '<(DEPTH)/webkit/glue/webkit_glue_common.gyp:glue_common',
         '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common',
         '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
         '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
-        'glue_common',
       ],
       'sources': [
         # This list contains all .h, .cc, and .mm files in glue except for
diff --git a/webkit/renderer/webkit_renderer.gypi b/webkit/renderer/webkit_renderer.gyp
index 6c2e9b6..14de2b9 100644
--- a/webkit/renderer/webkit_renderer.gypi
+++ b/webkit/renderer/webkit_renderer.gyp
@@ -21,7 +21,7 @@
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
-        'glue_common',
+        '<(DEPTH)/webkit/glue/webkit_glue_common.gyp:glue_common',
       ],
       'sources': [
         'cpp_bound_class.cc',
diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp
index c1b027a..7e39747 100644
--- a/webkit/support/webkit_support.gyp
+++ b/webkit/support/webkit_support.gyp
@@ -13,7 +13,6 @@
         '../glue/webkit_glue.gypi',
         '../plugins/webkit_plugins.gypi',
         '../renderer/media/webkit_media.gypi',
-        '../renderer/webkit_renderer.gypi',
         'webkit_support.gypi',
       ],
     }],
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index cda52f1..a4fa4e2 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -26,18 +26,18 @@
         '<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
         '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
+        '<(DEPTH)/webkit/glue/webkit_glue_common.gyp:glue_common',
         '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common',
         '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
         '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
+        '<(DEPTH)/webkit/renderer/webkit_renderer.gyp:webkit_renderer',
         '<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser',
         '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
         '<(DEPTH)/webkit/storage_renderer.gyp:webkit_storage_renderer',
         'glue',
         'glue_child',
-        'glue_common',
         'plugins',
         'webkit_media',
-        'webkit_renderer',
         'webkit_support_common',
       ],
       'include_dirs': [
@@ -114,8 +114,8 @@
         '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
+        '<(DEPTH)/webkit/renderer/webkit_renderer.gyp:webkit_renderer',
         'glue',
-        'webkit_renderer',
         'webkit_support_gfx',
       ],
       'export_dependent_settings': [