Commit 4fc896b6 authored by jamesr@chromium.org's avatar jamesr@chromium.org

GN: Fixes for component build

This enables webkit_unit_tests and makes public/blink work in the
component build.

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

git-svn-id: svn://svn.chromium.org/blink/trunk@180038 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 0b19b88e
......@@ -47,6 +47,28 @@ component("web") {
if (!use_default_render_theme) {
sources -= [ "default/WebRenderTheme.cpp" ]
}
if (is_component_build) {
deps += [
"//base/test:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/WebKit/Source/core:testing",
"//third_party/WebKit/Source/modules:modules_testing",
]
configs -= [
"//third_party/WebKit/Source:non_test_config",
]
sources += web_gypi.web_unittest_files
sources += bindings_unittest_files
sources += core_unittest_files
sources += modules_unittest_files
sources += platform_web_unittest_files
sources += [ "WebTestingSupport.cpp" ]
}
}
# GYP version: WebKit/Source/web/web.gyp:blink_web_test_support
......@@ -69,8 +91,6 @@ source_set("test_support") {
}
}
# TODO(GYP): Enable when //content/test:test_support links.
if (false) {
# GYP version: WebKit/Source/web/web_tests.gyp:webkit_unit_tests
test("webkit_unit_tests") {
deps = [
......@@ -87,10 +107,12 @@ test("webkit_unit_tests") {
"//third_party/zlib",
"//url",
"//v8",
]
]
sources = [ "tests/RunAllTests.cpp" ]
configs += [ "//third_party/WebKit/Source:config" ]
if (!is_component_build) {
deps += [ "//third_party/WebKit/Source/core" ]
......@@ -103,4 +125,3 @@ test("webkit_unit_tests") {
sources += platform_web_unittest_files
}
}
}
......@@ -12,6 +12,7 @@ group("blink") {
":blink_headers",
":blink_minimal",
"//third_party/WebKit/Source/web",
"//third_party/WebKit/Source/platform",
]
}
......
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