summaryrefslogtreecommitdiffstats
path: root/webkit/support
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-11 22:28:18 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-11 22:28:18 +0000
commit52997e963e3910755266bdb91275e12e28117ea6 (patch)
tree693c73741bf3083c5bc3ed96e161b50a8dd72685 /webkit/support
parent1ac55fc5c8c4341f2cb21b66d2d8d63d5040b032 (diff)
downloadchromium_src-52997e963e3910755266bdb91275e12e28117ea6.zip
chromium_src-52997e963e3910755266bdb91275e12e28117ea6.tar.gz
chromium_src-52997e963e3910755266bdb91275e12e28117ea6.tar.bz2
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
Diffstat (limited to 'webkit/support')
-rw-r--r--webkit/support/webkit_support.gyp1
-rw-r--r--webkit/support/webkit_support.gypi6
2 files changed, 3 insertions, 4 deletions
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': [