summaryrefslogtreecommitdiffstats
path: root/webkit/support
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-09 08:03:45 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-09 08:03:45 +0000
commit67f0d3a772c78b337d6120262eaf7647a95ec58b (patch)
tree49dc31a4f928e2c98303436e9d7697c28e44bba4 /webkit/support
parentabf91a6e38c696ae88fa7a02f25e3e767cbd085f (diff)
downloadchromium_src-67f0d3a772c78b337d6120262eaf7647a95ec58b.zip
chromium_src-67f0d3a772c78b337d6120262eaf7647a95ec58b.tar.gz
chromium_src-67f0d3a772c78b337d6120262eaf7647a95ec58b.tar.bz2
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
Diffstat (limited to 'webkit/support')
-rw-r--r--webkit/support/webkit_support.gyp1
-rw-r--r--webkit/support/webkit_support.gypi2
2 files changed, 1 insertions, 2 deletions
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',
],