OLD | NEW |
---|---|
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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/features.gni") | 5 import("//build/config/features.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 if (is_android) { | 7 if (is_android) { |
8 import("//build/config/android/config.gni") | 8 import("//build/config/android/config.gni") |
9 } | 9 } |
10 | 10 |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
100 "web_widget_test_client.cc", | 100 "web_widget_test_client.cc", |
101 "web_widget_test_client.h", | 101 "web_widget_test_client.h", |
102 "web_widget_test_proxy.cc", | 102 "web_widget_test_proxy.cc", |
103 "web_widget_test_proxy.h", | 103 "web_widget_test_proxy.h", |
104 ] | 104 ] |
105 | 105 |
106 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 106 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
107 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 107 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
108 | 108 |
109 deps = [ | 109 deps = [ |
110 ":resources", | |
111 "//base:base", | 110 "//base:base", |
112 "//base:i18n", | 111 "//base:i18n", |
113 "//cc", | 112 "//cc", |
114 "//cc/blink", | 113 "//cc/blink", |
115 "//gin", | 114 "//gin", |
116 "//gpu", | 115 "//gpu", |
117 "//gpu/command_buffer/client:gles2_interface", | 116 "//gpu/command_buffer/client:gles2_interface", |
118 "//media/midi:mojo_cpp_sources", | 117 "//media/midi:mojo_cpp_sources", |
119 "//net", | 118 "//net", |
120 "//skia", | 119 "//skia", |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
183 "resources/fonts/ChromiumAATTest.ttf", | 182 "resources/fonts/ChromiumAATTest.ttf", |
184 ] | 183 ] |
185 | 184 |
186 outputs = [ | 185 outputs = [ |
187 "{{bundle_resources_dir}}/{{source_file_part}}", | 186 "{{bundle_resources_dir}}/{{source_file_part}}", |
188 ] | 187 ] |
189 } | 188 } |
190 } | 189 } |
191 | 190 |
192 group("resources") { | 191 group("resources") { |
193 deps = [] | |
194 data_deps = [] | 192 data_deps = [] |
195 | 193 |
196 if (is_mac) { | 194 if (is_mac) { |
197 deps += [ ":test_runner_bundle_data" ] | |
Robert Sesek
2016/11/21 16:59:31
I think this broke Mac content_shell. Did you try
mithro
2016/11/22 06:02:35
No I did not. This seems to be passing fine on the
Robert Sesek
2016/11/22 16:50:23
The bots don't clobber by default. But your change
| |
198 data_deps += [ ":test_runner_bundle_data" ] | 195 data_deps += [ ":test_runner_bundle_data" ] |
199 } else { | 196 } else { |
200 deps += [ ":copy_ahem" ] | |
201 data_deps += [ ":copy_ahem" ] | 197 data_deps += [ ":copy_ahem" ] |
202 } | 198 } |
203 | 199 |
204 if (use_x11) { | 200 if (use_x11) { |
205 deps += [ ":copy_x11_fonts" ] | |
206 data_deps += [ ":copy_x11_fonts" ] | 201 data_deps += [ ":copy_x11_fonts" ] |
207 } | 202 } |
208 if (is_android) { | 203 if (is_android) { |
209 deps += [ ":copy_android_fonts" ] | |
210 data_deps += [ ":copy_android_fonts" ] | 204 data_deps += [ ":copy_android_fonts" ] |
211 } | 205 } |
212 } | 206 } |
213 | 207 |
214 if (is_win) { | 208 if (is_win) { |
215 executable("layout_test_helper") { | 209 executable("layout_test_helper") { |
216 sources = [ | 210 sources = [ |
217 "helper/layout_test_helper_win.cc", | 211 "helper/layout_test_helper_win.cc", |
218 ] | 212 ] |
219 | 213 |
220 deps = [ | 214 deps = [ |
221 "//build/config/sanitizers:deps", | 215 "//build/config/sanitizers:deps", |
222 "//build/win:default_exe_manifest", | 216 "//build/win:default_exe_manifest", |
223 ] | 217 ] |
224 } | 218 } |
225 } | 219 } |
OLD | NEW |