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

Side by Side Diff: ash/BUILD.gn

Issue 1684933002: Fix ash 'gn check' errors; whitelist target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comment. 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 unified diff | Download patch
« no previous file with comments | « .gn ('k') | ash/accelerators/accelerator_controller.cc » ('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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 8
9 assert(use_aura) 9 assert(use_aura)
10 assert(enable_hidpi) 10 assert(enable_hidpi)
(...skipping 27 matching lines...) Expand all
38 "//net", 38 "//net",
39 "//skia", 39 "//skia",
40 "//third_party/icu", 40 "//third_party/icu",
41 "//ui/accessibility", 41 "//ui/accessibility",
42 "//ui/app_list", 42 "//ui/app_list",
43 "//ui/aura", 43 "//ui/aura",
44 "//ui/base", 44 "//ui/base",
45 "//ui/base:ui_data_pack", 45 "//ui/base:ui_data_pack",
46 "//ui/base/ime", 46 "//ui/base/ime",
47 "//ui/compositor", 47 "//ui/compositor",
48 "//ui/display/types",
48 "//ui/events", 49 "//ui/events",
49 "//ui/events:events_base", 50 "//ui/events:events_base",
50 "//ui/events:gesture_detection", 51 "//ui/events:gesture_detection",
51 "//ui/events/devices", 52 "//ui/events/devices",
52 "//ui/gfx", 53 "//ui/gfx",
53 "//ui/gfx/geometry", 54 "//ui/gfx/geometry",
54 "//ui/keyboard", 55 "//ui/keyboard",
55 "//ui/message_center", 56 "//ui/message_center",
57 "//ui/native_theme",
58 "//ui/platform_window",
56 "//ui/platform_window/stub", 59 "//ui/platform_window/stub",
57 "//ui/resources", 60 "//ui/resources",
58 "//ui/strings", 61 "//ui/strings",
59 "//ui/views", 62 "//ui/views",
60 "//ui/wm", 63 "//ui/wm",
61 "//url", 64 "//url",
62 ] 65 ]
63 66
64 if (is_win) { 67 if (is_win) {
65 sources -= [ 68 sources -= [
(...skipping 18 matching lines...) Expand all
84 sources -= [ 87 sources -= [
85 "host/ash_window_tree_host_x11.cc", 88 "host/ash_window_tree_host_x11.cc",
86 "host/ash_window_tree_host_x11.h", 89 "host/ash_window_tree_host_x11.h",
87 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", 90 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
88 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", 91 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
89 ] 92 ]
90 } 93 }
91 94
92 if (use_ozone) { 95 if (use_ozone) {
93 deps += [ 96 deps += [
97 "//ui/events:dom_keycode_converter",
94 "//ui/events/ozone:events_ozone", 98 "//ui/events/ozone:events_ozone",
95 "//ui/ozone", 99 "//ui/ozone",
96 ] 100 ]
97 } 101 }
98 102
99 if (is_chromeos) { 103 if (is_chromeos) {
100 deps += [ 104 deps += [
101 "//chromeos", 105 "//chromeos",
102 "//chromeos:power_manager_proto", 106 "//chromeos:power_manager_proto",
103 "//device/bluetooth", 107 "//device/bluetooth",
108
109 # TODO(msw): Remove this; only ash_with_content should depend on webkit.
110 "//third_party/WebKit/public:blink_headers",
104 "//third_party/qcms", 111 "//third_party/qcms",
105 "//ui/chromeos:ui_chromeos", 112 "//ui/chromeos:ui_chromeos",
106 "//ui/chromeos/resources", 113 "//ui/chromeos/resources",
107 "//ui/chromeos/strings", 114 "//ui/chromeos/strings",
108 "//ui/display", 115 "//ui/display",
109 "//ui/display/util", 116 "//ui/display/util",
110 ] 117 ]
111 } else { 118 } else {
112 sources -= [ 119 sources -= [
113 "accelerators/key_hold_detector.cc", 120 "accelerators/key_hold_detector.cc",
(...skipping 29 matching lines...) Expand all
143 150
144 defines = [ "ASH_WITH_CONTENT_IMPLEMENTATION" ] 151 defines = [ "ASH_WITH_CONTENT_IMPLEMENTATION" ]
145 152
146 public_deps = [ 153 public_deps = [
147 ":ash", 154 ":ash",
148 ] 155 ]
149 deps = [ 156 deps = [
150 "//base", 157 "//base",
151 "//base/third_party/dynamic_annotations", 158 "//base/third_party/dynamic_annotations",
152 "//content/public/browser", 159 "//content/public/browser",
160 "//gpu/config",
153 "//ipc", 161 "//ipc",
154 "//skia", 162 "//skia",
155 "//ui/aura", 163 "//ui/aura",
156 "//ui/base", 164 "//ui/base",
157 "//ui/compositor", 165 "//ui/compositor",
158 "//ui/events", 166 "//ui/events",
159 "//ui/gfx", 167 "//ui/gfx",
160 "//ui/gfx/geometry", 168 "//ui/gfx/geometry",
161 "//ui/keyboard:keyboard_with_content", 169 "//ui/keyboard:keyboard_with_content",
162 "//ui/resources", 170 "//ui/resources",
163 "//ui/strings", 171 "//ui/strings",
164 "//ui/views", 172 "//ui/views",
165 "//ui/views/controls/webview", 173 "//ui/views/controls/webview",
166 "//ui/web_dialogs", 174 "//ui/web_dialogs",
167 "//url", 175 "//url",
168 ] 176 ]
169 } 177 }
170 178
179 # TODO(msw): Move support code with content deps to test_support_with_content.
171 source_set("test_support") { 180 source_set("test_support") {
172 testonly = true 181 testonly = true
173 sources = gypi_values.ash_test_support_sources 182 sources = gypi_values.ash_test_support_sources
174 configs += [ "//build/config:precompiled_headers" ] 183 configs += [ "//build/config:precompiled_headers" ]
175 184
176 public_deps = [ 185 public_deps = [
177 ":ash", 186 ":ash",
178 ] 187 ]
179 deps = [ 188 deps = [
180 ":test_support_with_content", # TODO(beng): reverse this direction. 189 ":test_support_with_content", # TODO(beng): reverse this direction.
181 "//ash/resources", 190 "//ash/resources",
191 "//base:i18n",
192 "//base/test:test_support",
182 "//components/signin/core/account_id", 193 "//components/signin/core/account_id",
194 "//components/user_manager:user_manager",
195 "//content/public/browser",
196 "//content/test:test_support",
197 "//device/bluetooth",
183 "//skia", 198 "//skia",
184 "//testing/gtest", 199 "//testing/gtest",
185 "//ui/accessibility", 200 "//ui/accessibility",
186 "//ui/app_list", 201 "//ui/app_list",
187 "//ui/app_list:test_support", 202 "//ui/app_list:test_support",
203 "//ui/aura",
204 "//ui/aura:test_support",
205 "//ui/base:test_support",
206 "//ui/compositor:test_support",
207 "//ui/display/types",
188 "//ui/events:events_base", 208 "//ui/events:events_base",
209 "//ui/events:test_support",
189 "//ui/events/devices", 210 "//ui/events/devices",
190 "//ui/gl", 211 "//ui/gl",
212 "//ui/gl:test_support",
213 "//ui/keyboard",
214 "//ui/message_center",
191 "//ui/views", 215 "//ui/views",
192 "//ui/views:test_support", 216 "//ui/views:test_support",
217 "//ui/wm",
193 ] 218 ]
194 219
195 if (is_win) { 220 if (is_win) {
196 deps += [ "//ui/platform_window/win" ] 221 deps += [ "//ui/platform_window/win" ]
197 } 222 }
198 223
224 if (use_x11) {
225 deps += [ "//ui/gfx/x" ]
226 }
227
199 if (is_chromeos) { 228 if (is_chromeos) {
200 deps += [ "//ui/display" ] 229 deps += [
230 "//chromeos",
231 "//ui/display",
232 ]
201 } 233 }
202 } 234 }
203 235
204 source_set("test_support_with_content") { 236 source_set("test_support_with_content") {
205 testonly = true 237 testonly = true
206 sources = gypi_values.ash_test_support_with_content_sources 238 sources = gypi_values.ash_test_support_with_content_sources
207 configs += [ "//build/config:precompiled_headers" ] 239 configs += [ "//build/config:precompiled_headers" ]
208 240
209 deps = [ 241 deps = [
210 ":ash_with_content", 242 ":ash_with_content",
211 "//content/test:test_support", 243 "//content/test:test_support",
212 "//skia", 244 "//skia",
213 ] 245 ]
214 } 246 }
215 247
216 source_set("interactive_ui_test_support") { 248 source_set("interactive_ui_test_support") {
217 testonly = true 249 testonly = true
218 configs += [ "//build/config:precompiled_headers" ] 250 configs += [ "//build/config:precompiled_headers" ]
219 public_deps = [ 251 public_deps = [
220 ":ash", 252 ":ash",
221 ":test_support", 253 ":test_support",
222 ] 254 ]
223 sources = [ 255 sources = [
224 "test/ash_interactive_ui_test_base.cc", 256 "test/ash_interactive_ui_test_base.cc",
225 "test/ash_interactive_ui_test_base.h", 257 "test/ash_interactive_ui_test_base.h",
226 ] 258 ]
227 deps = [ 259 deps = [
228 ":ash", 260 ":ash",
229 ":test_support", 261 ":test_support",
262 "//base",
230 "//skia", 263 "//skia",
231 "//testing/gtest", 264 "//testing/gtest",
265 "//ui/aura",
266 "//ui/base",
267 "//ui/gl:test_support",
232 ] 268 ]
233 } 269 }
234 270
235 static_library("ash_shell_lib") { 271 static_library("ash_shell_lib") {
236 testonly = true 272 testonly = true
237 sources = gypi_values.ash_shell_lib_sources 273 sources = gypi_values.ash_shell_lib_sources
238 274
239 deps = [ 275 deps = [
240 ":ash", 276 ":ash",
241 ":ash_with_content", 277 ":ash_with_content",
242 ":test_support", 278 ":test_support",
243 "//ash/resources", 279 "//ash/resources",
244 "//ash/strings", 280 "//ash/strings",
245 "//base", 281 "//base",
246 "//base:i18n", 282 "//base:i18n",
283 "//components/user_manager",
247 "//net", 284 "//net",
248 "//skia", 285 "//skia",
249 "//third_party/icu", 286 "//third_party/icu",
250 "//ui/app_list", 287 "//ui/app_list",
251 "//ui/aura", 288 "//ui/aura",
252 "//ui/base", 289 "//ui/base",
253 "//ui/base/ime", 290 "//ui/base/ime",
254 "//ui/compositor", 291 "//ui/compositor",
255 "//ui/events", 292 "//ui/events",
256 "//ui/events:events_base", 293 "//ui/events:events_base",
257 "//ui/gfx", 294 "//ui/gfx",
258 "//ui/gfx/geometry", 295 "//ui/gfx/geometry",
259 "//ui/keyboard", 296 "//ui/keyboard",
260 "//ui/keyboard:keyboard_with_content", 297 "//ui/keyboard:keyboard_with_content",
261 "//ui/message_center", 298 "//ui/message_center",
262 "//ui/resources", 299 "//ui/resources",
263 "//ui/views", 300 "//ui/views",
264 "//ui/views:test_support", 301 "//ui/views:test_support",
265 "//ui/views/examples:views_examples_lib", 302 "//ui/views/examples:views_examples_lib",
266 "//ui/views/examples:views_examples_with_content_lib", 303 "//ui/views/examples:views_examples_with_content_lib",
304 "//ui/wm",
267 ] 305 ]
268 } 306 }
269 307
270 static_library("ash_shell_lib_with_content") { 308 static_library("ash_shell_lib_with_content") {
271 testonly = true 309 testonly = true
272 sources = gypi_values.ash_shell_with_content_lib_sources 310 sources = gypi_values.ash_shell_with_content_lib_sources
273 311
274 deps = [ 312 deps = [
275 ":ash_shell_lib", 313 ":ash_shell_lib",
314 ":ash_with_content",
315 "//base:i18n",
276 "//chrome:packed_resources", 316 "//chrome:packed_resources",
277 "//content", 317 "//content",
278 "//content/shell:content_shell_lib", 318 "//content/shell:content_shell_lib",
319 "//device/bluetooth",
320 "//net",
279 "//skia", 321 "//skia",
322 "//ui/aura",
323 "//ui/base",
324 "//ui/compositor",
325 "//ui/events/devices",
326 "//ui/message_center",
327 "//ui/views:test_support",
328 "//ui/wm",
280 ] 329 ]
330
331 if (is_chromeos) {
332 deps += [ "//chromeos" ]
333 }
281 } 334 }
282 335
283 test("ash_unittests") { 336 test("ash_unittests") {
284 sources = gypi_values.ash_unittests_sources 337 sources = gypi_values.ash_unittests_sources
285 configs += [ "//build/config:precompiled_headers" ] 338 configs += [ "//build/config:precompiled_headers" ]
286 339
287 deps = [ 340 deps = [
288 ":ash", 341 ":ash",
289 ":ash_with_content", 342 ":ash_with_content",
290 ":test_support", 343 ":test_support",
344 ":test_support_with_content",
291 "//ash/resources", 345 "//ash/resources",
292 "//ash/strings", 346 "//ash/strings",
293 "//base", 347 "//base",
294 "//base/test:test_support", 348 "//base/test:test_support",
295 "//components/signin/core/account_id", 349 "//components/signin/core/account_id",
296 "//components/user_manager", 350 "//components/user_manager",
297 "//content/public/browser", 351 "//content/public/browser",
298 "//content/test:test_support", 352 "//content/test:test_support",
299 "//skia", 353 "//skia",
300 "//testing/gtest", 354 "//testing/gtest",
301 "//third_party/icu", 355 "//third_party/icu",
302 "//ui/accessibility", 356 "//ui/accessibility",
357 "//ui/app_list",
303 "//ui/aura", 358 "//ui/aura",
304 "//ui/aura:test_support", 359 "//ui/aura:test_support",
305 "//ui/base", 360 "//ui/base",
306 "//ui/base:test_support", 361 "//ui/base:test_support",
307 "//ui/base/ime", 362 "//ui/base/ime",
308 "//ui/compositor", 363 "//ui/compositor",
309 "//ui/compositor:test_support", 364 "//ui/compositor:test_support",
365 "//ui/display/types",
310 "//ui/events", 366 "//ui/events",
311 "//ui/events:gesture_detection", 367 "//ui/events:gesture_detection",
312 "//ui/events:test_support", 368 "//ui/events:test_support",
313 "//ui/events/devices", 369 "//ui/events/devices",
314 "//ui/gfx", 370 "//ui/gfx",
315 "//ui/gfx/geometry", 371 "//ui/gfx/geometry",
316 "//ui/keyboard", 372 "//ui/keyboard",
317 "//ui/keyboard:keyboard_with_content", 373 "//ui/keyboard:keyboard_with_content",
318 "//ui/message_center", 374 "//ui/message_center",
319 "//ui/message_center:test_support", 375 "//ui/message_center:test_support",
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 } 414 }
359 415
360 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 416 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
361 417
362 if (!use_x11) { 418 if (!use_x11) {
363 sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ] 419 sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ]
364 } 420 }
365 if (is_chromeos) { 421 if (is_chromeos) {
366 sources += [ "first_run/first_run_helper_unittest.cc" ] 422 sources += [ "first_run/first_run_helper_unittest.cc" ]
367 deps += [ 423 deps += [
424 "//chromeos",
368 "//chromeos:power_manager_proto", 425 "//chromeos:power_manager_proto",
369 "//chromeos:test_support_without_gmock", 426 "//chromeos:test_support_without_gmock",
370 "//device/bluetooth", 427 "//device/bluetooth",
428 "//ui/chromeos:ui_chromeos",
371 "//ui/display", 429 "//ui/display",
372 "//ui/display:test_support", 430 "//ui/display:test_support",
373 "//ui/display:test_util", 431 "//ui/display:test_util",
374 "//ui/display/types",
375 ] 432 ]
376 } else { 433 } else {
377 sources -= [ 434 sources -= [
378 "accelerators/magnifier_key_scroller_unittest.cc", 435 "accelerators/magnifier_key_scroller_unittest.cc",
379 "accelerators/spoken_feedback_toggler_unittest.cc", 436 "accelerators/spoken_feedback_toggler_unittest.cc",
380 "display/resolution_notification_controller_unittest.cc", 437 "display/resolution_notification_controller_unittest.cc",
381 "touch/touchscreen_util_unittest.cc", 438 "touch/touchscreen_util_unittest.cc",
382 ] 439 ]
383 } 440 }
384 441
385 if (!use_x11 || !is_chromeos) { 442 if (!use_x11 || !is_chromeos) {
386 sources -= [ "touch/touch_transformer_controller_unittest.cc" ] 443 sources -= [ "touch/touch_transformer_controller_unittest.cc" ]
387 } 444 }
388 445
389 if (!is_chromeos) { 446 if (!is_chromeos) {
390 sources -= [ "sticky_keys/sticky_keys_unittest.cc" ] 447 sources -= [ "sticky_keys/sticky_keys_unittest.cc" ]
391 } 448 }
392 } 449 }
393 450
394 executable("ash_shell_with_content") { 451 executable("ash_shell_with_content") {
395 testonly = true 452 testonly = true
396 sources = [ 453 sources = [
397 "shell/content/shell_with_content_main.cc", 454 "shell/content/shell_with_content_main.cc",
398 ] 455 ]
399 456
400 deps = [ 457 deps = [
401 ":ash_shell_lib_with_content", 458 ":ash_shell_lib_with_content",
459 "//base",
402 "//build/config/sanitizers:deps", 460 "//build/config/sanitizers:deps",
403 "//components/user_manager", 461 "//components/user_manager",
462 "//content",
463 "//content/public/app:both",
404 ] 464 ]
405 465
406 if (is_win) { 466 if (is_win) {
407 configs -= [ "//build/config/win:console" ] 467 configs -= [ "//build/config/win:console" ]
408 configs += [ "//build/config/win:windowed" ] 468 configs += [ "//build/config/win:windowed" ]
409 deps += [ "//sandbox" ] 469 deps += [ "//sandbox" ]
410 } 470 }
411 471
412 if (is_chromeos) { 472 if (is_chromeos) {
413 deps += [ "//device/bluetooth" ] 473 deps += [ "//device/bluetooth" ]
414 } 474 }
415 } 475 }
416 # When adding support for isolates, please have a look at run-time dependencies 476 # When adding support for isolates, please have a look at run-time dependencies
417 # in the ash_unittests_run target in ash.gyp. 477 # in the ash_unittests_run target in ash.gyp.
OLDNEW
« no previous file with comments | « .gn ('k') | ash/accelerators/accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698