| OLD | NEW |
| 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 gypi_values = exec_script("//build/gypi_to_gn.py", | 9 gypi_values = exec_script("//build/gypi_to_gn.py", |
| 10 [ rebase_path("ash.gyp") ], | 10 [ rebase_path("ash.gyp") ], |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 ] | 85 ] |
| 86 } | 86 } |
| 87 | 87 |
| 88 if (use_ozone) { | 88 if (use_ozone) { |
| 89 deps += [ | 89 deps += [ |
| 90 "//ui/events/ozone:events_ozone", | 90 "//ui/events/ozone:events_ozone", |
| 91 "//ui/ozone", | 91 "//ui/ozone", |
| 92 ] | 92 ] |
| 93 } | 93 } |
| 94 | 94 |
| 95 if (is_chromeos) { | 95 if (is_chromeos_ui) { |
| 96 deps += [ | 96 deps += [ |
| 97 "//device/bluetooth", | 97 "//device/bluetooth", |
| 98 "//ui/display", | 98 "//ui/display", |
| 99 "//ui/display/util", | 99 "//ui/display/util", |
| 100 "//chromeos", | 100 "//chromeos", |
| 101 "//chromeos:power_manager_proto", | 101 "//chromeos:power_manager_proto", |
| 102 "//third_party/qcms", | 102 "//third_party/qcms", |
| 103 "//ui/chromeos/resources", | 103 "//ui/chromeos/resources", |
| 104 "//ui/chromeos/strings", | 104 "//ui/chromeos/strings", |
| 105 "//ui/chromeos:ui_chromeos", | 105 "//ui/chromeos:ui_chromeos", |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 "//ui/message_center:test_support", | 308 "//ui/message_center:test_support", |
| 309 "//ui/resources", | 309 "//ui/resources", |
| 310 "//ui/views", | 310 "//ui/views", |
| 311 "//ui/views:test_support", | 311 "//ui/views:test_support", |
| 312 "//ui/views/controls/webview:test_support", | 312 "//ui/views/controls/webview:test_support", |
| 313 "//ui/web_dialogs:test_support", | 313 "//ui/web_dialogs:test_support", |
| 314 "//ui/wm", | 314 "//ui/wm", |
| 315 "//url", | 315 "//url", |
| 316 ] | 316 ] |
| 317 | 317 |
| 318 if (!is_chromeos) { | 318 if (!is_chromeos_ui) { |
| 319 sources -= [ | 319 sources -= [ |
| 320 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 | 320 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 |
| 321 "focus_cycler_unittest.cc", | 321 "focus_cycler_unittest.cc", |
| 322 | 322 |
| 323 # All tests for multiple displays: not supported on Windows Ash. | 323 # All tests for multiple displays: not supported on Windows Ash. |
| 324 "wm/drag_window_resizer_unittest.cc", | 324 "wm/drag_window_resizer_unittest.cc", |
| 325 | 325 |
| 326 # Accelerometer is only available on Chrome OS. | 326 # Accelerometer is only available on Chrome OS. |
| 327 "wm/maximize_mode/maximize_mode_controller_unittest.cc", | 327 "wm/maximize_mode/maximize_mode_controller_unittest.cc", |
| 328 | 328 |
| 329 # Can't resize on Windows Ash. http://crbug.com/165962 | 329 # Can't resize on Windows Ash. http://crbug.com/165962 |
| 330 "autoclick/autoclick_unittest.cc", | 330 "autoclick/autoclick_unittest.cc", |
| 331 "magnifier/magnification_controller_unittest.cc", | 331 "magnifier/magnification_controller_unittest.cc", |
| 332 "sticky_keys/sticky_keys_overlay_unittest.cc", | 332 "sticky_keys/sticky_keys_overlay_unittest.cc", |
| 333 "system/tray/media_security/multi_profile_media_tray_item_unittest.cc", | 333 "system/tray/media_security/multi_profile_media_tray_item_unittest.cc", |
| 334 "virtual_keyboard_controller_unittest.cc", | 334 "virtual_keyboard_controller_unittest.cc", |
| 335 "wm/workspace/workspace_window_resizer_unittest.cc", | 335 "wm/workspace/workspace_window_resizer_unittest.cc", |
| 336 ] | 336 ] |
| 337 sources += [ | 337 sources += [ |
| 338 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TODO
(GYP) | 338 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TODO
(GYP) |
| 339 ] | 339 ] |
| 340 } | 340 } |
| 341 | 341 |
| 342 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 342 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
| 343 | 343 |
| 344 if (!use_x11) { | 344 if (!use_x11) { |
| 345 sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ] | 345 sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ] |
| 346 } | 346 } |
| 347 if (is_chromeos) { | 347 if (is_chromeos_ui) { |
| 348 sources += [ "first_run/first_run_helper_unittest.cc" ] | 348 sources += [ "first_run/first_run_helper_unittest.cc" ] |
| 349 deps += [ | 349 deps += [ |
| 350 "//device/bluetooth", | 350 "//device/bluetooth", |
| 351 "//ui/display", | 351 "//ui/display", |
| 352 "//ui/display:test_util", | 352 "//ui/display:test_util", |
| 353 "//ui/display/types", | 353 "//ui/display/types", |
| 354 "//chromeos:power_manager_proto", | 354 "//chromeos:power_manager_proto", |
| 355 "//chromeos:test_support_without_gmock", | 355 "//chromeos:test_support_without_gmock", |
| 356 ] | 356 ] |
| 357 } else { | 357 } else { |
| 358 sources -= [ | 358 sources -= [ |
| 359 "accelerators/magnifier_key_scroller_unittest.cc", | 359 "accelerators/magnifier_key_scroller_unittest.cc", |
| 360 "accelerators/spoken_feedback_toggler_unittest.cc", | 360 "accelerators/spoken_feedback_toggler_unittest.cc", |
| 361 "display/resolution_notification_controller_unittest.cc", | 361 "display/resolution_notification_controller_unittest.cc", |
| 362 "touch/touchscreen_util_unittest.cc", | 362 "touch/touchscreen_util_unittest.cc", |
| 363 ] | 363 ] |
| 364 } | 364 } |
| 365 | 365 |
| 366 if (!use_x11 || !is_chromeos) { | 366 if (!use_x11 || !is_chromeos_ui) { |
| 367 sources -= [ "touch/touch_transformer_controller_unittest.cc" ] | 367 sources -= [ "touch/touch_transformer_controller_unittest.cc" ] |
| 368 } | 368 } |
| 369 | 369 |
| 370 # TODO(GYP) is this necessary? | 370 # TODO(GYP) is this necessary? |
| 371 #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { | 371 #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { |
| 372 # ldflags = "-rdynamic" | 372 # ldflags = "-rdynamic" |
| 373 | 373 |
| 374 if (!is_chromeos) { | 374 if (!is_chromeos_ui) { |
| 375 sources -= [ "sticky_keys/sticky_keys_unittest.cc" ] | 375 sources -= [ "sticky_keys/sticky_keys_unittest.cc" ] |
| 376 } | 376 } |
| 377 } | 377 } |
| 378 | 378 |
| 379 executable("ash_shell") { | 379 executable("ash_shell") { |
| 380 testonly = true | 380 testonly = true |
| 381 sources = [ | 381 sources = [ |
| 382 "shell/shell_main.cc", | 382 "shell/shell_main.cc", |
| 383 ] | 383 ] |
| 384 | 384 |
| 385 deps = [ | 385 deps = [ |
| 386 ":ash_shell_lib", | 386 ":ash_shell_lib", |
| 387 "//components/user_manager", | 387 "//components/user_manager", |
| 388 ] | 388 ] |
| 389 | 389 |
| 390 if (is_win) { | 390 if (is_win) { |
| 391 configs -= [ "//build/config/win:console" ] | 391 configs -= [ "//build/config/win:console" ] |
| 392 configs += [ "//build/config/win:windowed" ] | 392 configs += [ "//build/config/win:windowed" ] |
| 393 deps += [ "//sandbox" ] | 393 deps += [ "//sandbox" ] |
| 394 } | 394 } |
| 395 | 395 |
| 396 if (is_chromeos) { | 396 if (is_chromeos_ui) { |
| 397 deps += [ "//device/bluetooth" ] | 397 deps += [ "//device/bluetooth" ] |
| 398 } | 398 } |
| 399 } | 399 } |
| 400 # When adding support for isolates, please have a look at run-time dependencies | 400 # When adding support for isolates, please have a look at run-time dependencies |
| 401 # in the ash_unittests_run target in ash.gyp. | 401 # in the ash_unittests_run target in ash.gyp. |
| OLD | NEW |