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

Side by Side Diff: Source/web/BUILD.gn

Issue 618373003: [bindings] partial interfaces should not violate componentization (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed patch conflict Created 6 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/modules/modules.gyp ('k') | Source/web/WebTestingSupport.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 import("//third_party/WebKit/Source/bindings/bindings.gni") 6 import("//third_party/WebKit/Source/bindings/bindings.gni")
7 import("//third_party/WebKit/Source/config.gni") 7 import("//third_party/WebKit/Source/config.gni")
8 import("//third_party/WebKit/Source/core/core.gni") 8 import("//third_party/WebKit/Source/core/core.gni")
9 import("//third_party/WebKit/Source/modules/modules.gni") 9 import("//third_party/WebKit/Source/modules/modules.gni")
10 import("//third_party/WebKit/Source/platform/platform.gni") 10 import("//third_party/WebKit/Source/platform/platform.gni")
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 "//third_party/WebKit/Source:non_test_config", 62 "//third_party/WebKit/Source:non_test_config",
63 ] 63 ]
64 64
65 sources += web_gypi.web_unittest_files 65 sources += web_gypi.web_unittest_files
66 sources += bindings_unittest_files 66 sources += bindings_unittest_files
67 sources += core_unittest_files 67 sources += core_unittest_files
68 sources += modules_unittest_files 68 sources += modules_unittest_files
69 sources += platform_web_unittest_files 69 sources += platform_web_unittest_files
70 70
71 sources += [ "WebTestingSupport.cpp" ] 71 sources += [ "WebTestingSupport.cpp" ]
72 include_dirs += [ "$root_gen_dir/blink" ]
72 } 73 }
73 74
74 if (is_android) { 75 if (is_android) {
75 set_sources_assignment_filter([]) 76 set_sources_assignment_filter([])
76 sources += [ "linux/WebFontRendering.cpp" ] 77 sources += [ "linux/WebFontRendering.cpp" ]
77 set_sources_assignment_filter(sources_assignment_filter) 78 set_sources_assignment_filter(sources_assignment_filter)
78 } 79 }
79 } 80 }
80 81
81 # GYP version: WebKit/Source/web/web.gyp:blink_web_test_support 82 # GYP version: WebKit/Source/web/web.gyp:blink_web_test_support
82 source_set("test_support") { 83 source_set("test_support") {
83 if (!is_component_build) { 84 if (!is_component_build) {
84 deps = [ 85 deps = [
85 "//skia", 86 "//skia",
86 "//third_party/WebKit/Source/core:testing", 87 "//third_party/WebKit/Source/core:testing",
87 "//third_party/WebKit/Source/modules:modules_testing", 88 "//third_party/WebKit/Source/modules:modules_testing",
88 "//third_party/WebKit/Source/wtf", 89 "//third_party/WebKit/Source/wtf",
90 "//v8",
89 ] 91 ]
90 92
91 sources = [ "WebTestingSupport.cpp" ] 93 sources = [ "WebTestingSupport.cpp" ]
92 94
93 configs -= [ "//build/config/compiler:chromium_code" ] 95 configs -= [ "//build/config/compiler:chromium_code" ]
94 configs += [ 96 configs += [
95 "//build/config/compiler:no_chromium_code", 97 "//build/config/compiler:no_chromium_code",
96 "//third_party/WebKit/Source:config", 98 "//third_party/WebKit/Source:config",
97 ] 99 ]
100
101 include_dirs = [
102 "$root_gen_dir/blink",
103 ]
98 } 104 }
99 } 105 }
100 106
101 # GYP version: WebKit/Source/web/web_tests.gyp:webkit_unit_tests 107 # GYP version: WebKit/Source/web/web_tests.gyp:webkit_unit_tests
102 test("webkit_unit_tests") { 108 test("webkit_unit_tests") {
103 deps = [ 109 deps = [
104 ":test_support", 110 ":test_support",
105 ":web", 111 ":web",
106 "//base", 112 "//base",
107 "//base/test:test_support", 113 "//base/test:test_support",
(...skipping 17 matching lines...) Expand all
125 131
126 configs += [ "//third_party/WebKit/Source:inside_blink" ] 132 configs += [ "//third_party/WebKit/Source:inside_blink" ]
127 133
128 sources += web_gypi.web_unittest_files 134 sources += web_gypi.web_unittest_files
129 sources += bindings_unittest_files 135 sources += bindings_unittest_files
130 sources += core_unittest_files 136 sources += core_unittest_files
131 sources += modules_unittest_files 137 sources += modules_unittest_files
132 sources += platform_web_unittest_files 138 sources += platform_web_unittest_files
133 } 139 }
134 } 140 }
OLDNEW
« no previous file with comments | « Source/modules/modules.gyp ('k') | Source/web/WebTestingSupport.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698