Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Unified Diff: third_party/WebKit/Source/web/BUILD.gn

Issue 1676083002: Extract webkit_unit_tests from blink_web component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Win dbg non-oilpan fix: make TextFinder non-copyable Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/modules/modules.gyp ('k') | third_party/WebKit/Source/web/ChromeClientImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/BUILD.gn
diff --git a/third_party/WebKit/Source/web/BUILD.gn b/third_party/WebKit/Source/web/BUILD.gn
index 8d0ef7ae49511900c1e5af3ab13bb2c783b879c1..95570befaa9c6adec3fdde62a322f483025bbfbc 100644
--- a/third_party/WebKit/Source/web/BUILD.gn
+++ b/third_party/WebKit/Source/web/BUILD.gn
@@ -39,35 +39,14 @@ component("web") {
"//third_party/WebKit/Source:non_test_config",
]
+ defines = [ "BLINK_WEB_IMPLEMENTATION=1" ]
+
sources = web_gypi.web_files
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",
- "//third_party/WebKit/Source/platform:test_support",
- "//third_party/WebKit/Source/wtf:test_support",
- ]
-
- configs -= [ "//third_party/WebKit/Source:non_test_config" ]
-
- sources += web_unittest_files
- sources += bindings_unittest_files
- sources += core_unittest_files
- sources += modules_unittest_files
- sources += platform_web_unittest_files
-
- sources += [ "WebTestingSupport.cpp" ]
- include_dirs += [ "$root_gen_dir/blink" ]
- }
-
if (is_android) {
set_sources_assignment_filter([])
sources += [ "linux/WebFontRendering.cpp" ]
@@ -82,23 +61,21 @@ component("web") {
# GYP version: WebKit/Source/web/web.gyp:blink_web_test_support
source_set("test_support") {
- if (!is_component_build) {
- deps = [
- "//skia",
- "//third_party/WebKit/Source/core:testing",
- "//third_party/WebKit/Source/modules:modules_testing",
- "//third_party/WebKit/Source/wtf",
- "//v8",
- ]
+ deps = [
+ "//skia",
+ "//third_party/WebKit/Source/core:testing",
+ "//third_party/WebKit/Source/modules:modules_testing",
+ "//third_party/WebKit/Source/wtf",
+ "//v8",
+ ]
- sources = [
- "WebTestingSupport.cpp",
- ]
+ sources = [
+ "WebTestingSupport.cpp",
+ ]
- configs += [ "//third_party/WebKit/Source:config" ]
+ configs += [ "//third_party/WebKit/Source:config" ]
- include_dirs = [ "$root_gen_dir/blink" ]
- }
+ include_dirs = [ "$root_gen_dir/blink" ]
}
group("webkit_unit_tests_data") {
@@ -129,6 +106,8 @@ test("webkit_unit_tests") {
"//content/test:test_support",
"//testing/gmock",
"//testing/gtest",
+ "//third_party/WebKit/Source/core",
+ "//third_party/WebKit/Source/modules",
"//third_party/WebKit/Source/platform:test_support",
"//third_party/WebKit/Source/wtf",
"//third_party/WebKit/Source/wtf:test_support",
@@ -146,20 +125,16 @@ test("webkit_unit_tests") {
sources = [
"tests/RunAllTests.cpp",
]
+ sources += web_unittest_files
+ sources += bindings_unittest_files
+ sources += core_unittest_files
+ sources += modules_unittest_files
+ sources += platform_web_unittest_files
- configs += [ "//third_party/WebKit/Source:config" ]
-
- if (!is_component_build) {
- deps += [ "//third_party/WebKit/Source/core" ]
-
- configs += [ "//third_party/WebKit/Source:inside_blink" ]
-
- sources += web_unittest_files
- sources += bindings_unittest_files
- sources += core_unittest_files
- sources += modules_unittest_files
- sources += platform_web_unittest_files
- }
+ configs += [
+ "//third_party/WebKit/Source:config",
+ "//third_party/WebKit/Source:inside_blink",
+ ]
if (is_android) {
deps += [
« no previous file with comments | « third_party/WebKit/Source/modules/modules.gyp ('k') | third_party/WebKit/Source/web/ChromeClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698