Skip to content

GitLab

T
tangled
Commit 32bc515f authored by tfarina@chromium.org's avatar tfarina@chromium.org
Browse files
Options

Cleanup webkit_child target and dependencies on it. 

BUG=338338
TEST=None
R=jamesr@chromium.org
TBR=darin@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285619 0039d316-1c4b-4281-b951-d872f2087c98
parent 42f5fe54
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 110 deletions
chrome/chrome_renderer.gypi
View file @ 32bc515f
......@@ -301,7 +301,6 @@
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
'../ui/surface/surface.gyp:surface',
'../webkit/child/webkit_child.gyp:webkit_child',
'../webkit/webkit_resources.gyp:webkit_resources',
],
'include_dirs': [
......
chrome/chrome_tests_unit.gypi
View file @ 32bc515f
......@@ -312,7 +312,6 @@
'../ppapi/ppapi_internal.gyp:ppapi_shared',
'../sql/sql.gyp:test_support_sql',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../webkit/child/webkit_child.gyp:webkit_child',
],
'export_dependent_settings': [
'renderer',
......
content/content_renderer.gypi
View file @ 32bc515f
......@@ -30,7 +30,6 @@
'../ui/native_theme/native_theme.gyp:native_theme',
'../ui/surface/surface.gyp:surface',
'../v8/tools/gyp/v8.gyp:v8',
'../webkit/child/webkit_child.gyp:webkit_child',
'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
'../webkit/storage_common.gyp:webkit_storage_common',
],
......
content/content_tests.gypi
View file @ 32bc515f
......@@ -282,7 +282,6 @@
'../ui/compositor/compositor.gyp:compositor_test_support',
'../ui/surface/surface.gyp:surface',
'../v8/tools/gyp/v8.gyp:v8',
'../webkit/child/webkit_child.gyp:webkit_child',
'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
'../webkit/storage_browser.gyp:webkit_storage_browser',
'../webkit/storage_common.gyp:webkit_storage_common',
......@@ -370,6 +369,7 @@
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc',
'../webkit/child/webkit_child.gyp:webkit_child',
],
'include_dirs': [
'..',
......@@ -748,7 +748,6 @@
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../ui/gl/gl.gyp:gl',
'../webkit/child/webkit_child.gyp:webkit_child',
'../webkit/storage_browser.gyp:webkit_storage_browser',
'../webkit/storage_common.gyp:webkit_storage_common',
],
......@@ -1096,7 +1095,6 @@
'../ui/resources/ui_resources.gyp:ui_resources',
'../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
'../ui/snapshot/snapshot.gyp:snapshot',
'../webkit/child/webkit_child.gyp:webkit_child',
'../ui/accessibility/accessibility.gyp:ax_gen',
],
'include_dirs': [
......@@ -1356,9 +1354,6 @@
'../ui/gfx/gfx.gyp:gfx_test_support',
'../ui/gl/gl.gyp:gl',
'../v8/tools/gyp/v8.gyp:v8',
# The following dependency provides the missing symbol
# HeapProfilerStart in Linux component builds.
'../webkit/child/webkit_child.gyp:webkit_child',
],
'include_dirs': [
'..',
......@@ -1388,9 +1383,6 @@
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/gl/gl.gyp:gl',
# The following two dependencies provide the missing
# symbol HeapProfilerStart in Linux component builds.
'../webkit/child/webkit_child.gyp:webkit_child',
],
'include_dirs': [
'..',
......
ui/app_list/app_list.gyp
View file @ 32bc515f
......@@ -265,10 +265,6 @@
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../../base/allocator/allocator.gyp:allocator',
# The following two dependencies provide the missing
# symbol HeapProfilerStart in Linux component builds.
# They probably can be removed after http://crbug.com/263316
'../../webkit/child/webkit_child.gyp:webkit_child',
],
}],
['OS=="win" and win_use_allocator_shim==1', {
......
webkit/child/BUILD.gn
View file @ 32bc515f
......@@ -11,46 +11,9 @@ component("child") {
]
defines = [ "WEBKIT_CHILD_IMPLEMENTATION" ]
include_dirs = [
# For JNI generated header.
"$root_gen_dir/webkit",
]
configs += [ "//build/config/compiler:wexit_time_destructors" ]
if (is_win) {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
cflags = [ "/wd4267" ]
}
if (is_mac) {
libs = [ "QuartzCore.framework" ]
}
if (is_android) {
#deps += [ ":overscroller_jni_headers" ] TODO(GYP)
}
deps = [
"//base",
"//base:i18n",
"//base/third_party/dynamic_annotations",
"//net",
"//skia",
"//third_party/WebKit/public:blink",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/native_theme",
"//url",
"//v8",
"//webkit/common",
]
}
#TODO(GYP)
#'target_name': 'overscroller_jni_headers',
#'type': 'none',
#'variables': {
# 'jni_gen_package': 'webkit',
# 'input_java_class': 'android/widget/OverScroller.class',
#},
#'includes': [ '../../build/jar_file_jni_generator.gypi' ],
webkit/child/webkit_child.gyp
View file @ 32bc515f
......@@ -6,77 +6,22 @@
'variables': {
'chromium_code': 1,
},
'conditions': [
['OS=="android"',
{
'targets': [
{
'target_name': 'overscroller_jni_headers',
'type': 'none',
'variables': {
'jni_gen_package': 'webkit',
'input_java_class': 'android/widget/OverScroller.class',
},
'includes': [ '../../build/jar_file_jni_generator.gypi' ],
},
],
}
],
],
'targets': [
{
'target_name': 'webkit_child',
'type': '<(component)',
'variables': { 'enable_wexit_time_destructors': 1, },
'defines': [
'WEBKIT_CHILD_IMPLEMENTATION',
],
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_i18n',
'<(DEPTH)/base/base.gyp:base_static',
'<(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/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
'<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
'<(DEPTH)/url/url.gyp:url_lib',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
],
'include_dirs': [
# For JNI generated header.
'<(SHARED_INTERMEDIATE_DIR)/webkit',
'../../base/base.gyp:base',
'../../net/net.gyp:net',
],
# This target exports a hard dependency because dependent targets may
# include the header generated above.
'hard_dependency': 1,
'sources': [
'resource_loader_bridge.cc',
'resource_loader_bridge.h',
'webkit_child_export.h',
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267 ],
'conditions': [
['OS=="mac"',
{
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
],
},
}
],
['OS=="android"',
{
'dependencies': [
'overscroller_jni_headers',
],
}
],
],
},
],
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment