Move webkit_common to its own gyp file

This pulls the webkit_common target out of webkit_support.gyp so that we
can extract targets that depend on this out of webkit_support.gyp without
creating cycles between gyp files, which is forbidden on darwin.

Depends on https://codereview.chromium.org/17472006/ to move the resources
target.

R=darin

Review URL: https://chromiumcodereview.appspot.com/17836007

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

5 files changed, 8 insertions, 6 deletions

diff --git a/webkit/common/webkit_common.gypi b/webkit/common/webkit_common.gyp
index c688ce9..255ed75 100644
--- a/webkit/common/webkit_common.gypi
+++ b/webkit/common/webkit_common.gyp
@@ -3,11 +3,14 @@
 # found in the LICENSE file.
 
 {
+  'variables': {
+    'enable_wexit_time_destructors': 1,
+    'chromium_code': 1
+  },
   'targets': [
     {
       'target_name': 'webkit_common',
       'type': '<(component)',
-      'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
         'WEBKIT_COMMON_IMPLEMENTATION',
       ],
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 9bb5989..a8e67ad 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -162,8 +162,8 @@
         '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/url/url.gyp:url_lib',
+        '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
         'glue_common',
-        'webkit_common',
       ],
 
       'sources': [
@@ -209,6 +209,7 @@
         '<(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/common/webkit_common.gyp:webkit_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',
@@ -217,7 +218,6 @@
         '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
         'glue_common',
         'plugins',
-        'webkit_common',
         'webkit_media',
       ],
       'include_dirs': [
diff --git a/webkit/plugins/webkit_plugins.gypi b/webkit/plugins/webkit_plugins.gypi
index f75499a..b8c9b73 100644
--- a/webkit/plugins/webkit_plugins.gypi
+++ b/webkit/plugins/webkit_plugins.gypi
@@ -37,11 +37,11 @@
         '<(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/common/webkit_common.gyp:webkit_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',
-        'webkit_common',
       ],
       'sources': [
         # This list contains all .h, .cc, and .mm files in glue except for
diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp
index 90de6d5..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',
-        '../common/webkit_common.gypi',
         'webkit_support.gypi',
       ],
     }],
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index e6883fb..5916cde 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -26,6 +26,7 @@
         '<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base',
         '<(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/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',
@@ -37,7 +38,6 @@
         'glue_common',
         'glue_renderer',
         'plugins',
-        'webkit_common',
         'webkit_media',
         'webkit_support_common',
       ],