summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 23:06:24 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 23:06:24 +0000
commitf6a61b7075a9926be52f695c32f34856c3a45746 (patch)
treebf6eabac2f2fa696138848d87ebb02040099927a /content
parentf5dc03a4dfd7506951a655ee23f27c34ca103720 (diff)
downloadchromium_src-f6a61b7075a9926be52f695c32f34856c3a45746.zip
chromium_src-f6a61b7075a9926be52f695c32f34856c3a45746.tar.gz
chromium_src-f6a61b7075a9926be52f695c32f34856c3a45746.tar.bz2
Extract webkit_child target from glue.
BUG=239107 TEST=everything still builds R=jamesr@chromium.org TBR=darin Review URL: https://codereview.chromium.org/54583005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/content_child.gypi2
-rw-r--r--content/content_renderer.gypi2
-rw-r--r--content/content_tests.gypi10
3 files changed, 7 insertions, 7 deletions
diff --git a/content/content_child.gypi b/content/content_child.gypi
index 59bd64e..583d7a1 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -178,8 +178,8 @@
'dependencies': [
'../third_party/WebKit/public/blink.gyp:blink',
'../third_party/npapi/npapi.gyp:npapi',
+ '../webkit/child/webkit_child.gyp:webkit_child',
'../webkit/common/webkit_common.gyp:webkit_common',
- '../webkit/glue/webkit_glue.gyp:glue_child',
],
}],
['use_aura==1', {
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 1e72a81..8255f9b 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -18,10 +18,10 @@
'../ui/surface/surface.gyp:surface',
'../ui/ui.gyp:keycode_converter',
'../v8/tools/gyp/v8.gyp:v8',
+ '../webkit/child/webkit_child.gyp:webkit_child',
'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
'../webkit/common/webkit_common.gyp:webkit_common',
'../webkit/glue/webkit_glue.gyp:glue',
- '../webkit/glue/webkit_glue.gyp:glue_child',
'../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
'../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
'../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 565d009..4c54f17f 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -225,10 +225,10 @@
'../third_party/WebKit/public/blink.gyp:blink',
'../third_party/WebKit/public/blink_test_runner.gyp:blink_test_runner',
'../ui/surface/surface.gyp:surface',
+ '../webkit/child/webkit_child.gyp:webkit_child',
'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
'../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
'../webkit/glue/webkit_glue.gyp:glue',
- '../webkit/glue/webkit_glue.gyp:glue_child',
'../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
'../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
'../webkit/storage_browser.gyp:webkit_storage_browser',
@@ -649,7 +649,7 @@
'../v8/tools/gyp/v8.gyp:v8',
'../webkit/common/webkit_common.gyp:webkit_common',
'../webkit/glue/webkit_glue.gyp:glue',
- '../webkit/glue/webkit_glue.gyp:glue_child',
+ '../webkit/child/webkit_child.gyp:webkit_child',
'../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
'../webkit/storage_browser.gyp:webkit_storage_browser',
'../webkit/storage_common.gyp:webkit_storage_common',
@@ -870,8 +870,8 @@
'../ui/snapshot/snapshot.gyp:snapshot',
'../ui/ui.gyp:ui',
'../ui/ui.gyp:ui_resources',
+ '../webkit/child/webkit_child.gyp:webkit_child',
'../webkit/glue/webkit_glue.gyp:glue',
- '../webkit/glue/webkit_glue.gyp:glue_child',
'../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
],
'include_dirs': [
@@ -1113,8 +1113,8 @@
'../third_party/WebKit/public/blink.gyp:blink',
# The following two dependencies provide the missing
# symbol HeapProfilerStart in Linux component builds.
+ '../webkit/child/webkit_child.gyp:webkit_child',
'../webkit/glue/webkit_glue.gyp:glue',
- '../webkit/glue/webkit_glue.gyp:glue_child',
],
'include_dirs': [
'..',
@@ -1146,7 +1146,7 @@
# The following two dependencies provide the missing
# symbol HeapProfilerStart in Linux component builds.
'../webkit/glue/webkit_glue.gyp:glue',
- '../webkit/glue/webkit_glue.gyp:glue_child',
+ '../webkit/child/webkit_child.gyp:webkit_child',
],
'include_dirs': [
'..',