| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 | 89 |
| 90 if (use_ozone) { | 90 if (use_ozone) { |
| 91 deps += [ | 91 deps += [ |
| 92 "//ui/events/ozone:events_ozone", | 92 "//ui/events/ozone:events_ozone", |
| 93 "//ui/ozone", | 93 "//ui/ozone", |
| 94 ] | 94 ] |
| 95 } | 95 } |
| 96 | 96 |
| 97 if (is_chromeos) { | 97 if (is_chromeos) { |
| 98 deps += [ | 98 deps += [ |
| 99 "//chromeos", |
| 100 "//chromeos:power_manager_proto", |
| 99 "//device/bluetooth", | 101 "//device/bluetooth", |
| 102 "//third_party/qcms", |
| 103 "//ui/chromeos:ui_chromeos", |
| 104 "//ui/chromeos/resources", |
| 105 "//ui/chromeos/strings", |
| 100 "//ui/display", | 106 "//ui/display", |
| 101 "//ui/display/util", | 107 "//ui/display/util", |
| 102 "//chromeos", | |
| 103 "//chromeos:power_manager_proto", | |
| 104 "//third_party/qcms", | |
| 105 "//ui/chromeos/resources", | |
| 106 "//ui/chromeos/strings", | |
| 107 "//ui/chromeos:ui_chromeos", | |
| 108 ] | 108 ] |
| 109 } else { | 109 } else { |
| 110 sources -= [ | 110 sources -= [ |
| 111 "accelerators/key_hold_detector.cc", | 111 "accelerators/key_hold_detector.cc", |
| 112 "accelerators/key_hold_detector.h", | 112 "accelerators/key_hold_detector.h", |
| 113 "accelerators/magnifier_key_scroller.cc", | 113 "accelerators/magnifier_key_scroller.cc", |
| 114 "accelerators/magnifier_key_scroller.h", | 114 "accelerators/magnifier_key_scroller.h", |
| 115 "accelerators/spoken_feedback_toggler.cc", | 115 "accelerators/spoken_feedback_toggler.cc", |
| 116 "accelerators/spoken_feedback_toggler.h", | 116 "accelerators/spoken_feedback_toggler.h", |
| 117 "display/display_configurator_animation.cc", | 117 "display/display_configurator_animation.cc", |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 sources = gypi_values.ash_shell_lib_sources | 234 sources = gypi_values.ash_shell_lib_sources |
| 235 | 235 |
| 236 deps = [ | 236 deps = [ |
| 237 ":ash", | 237 ":ash", |
| 238 ":ash_with_content", | 238 ":ash_with_content", |
| 239 ":test_support", | 239 ":test_support", |
| 240 "//ash/resources", | 240 "//ash/resources", |
| 241 "//ash/strings", | 241 "//ash/strings", |
| 242 "//base", | 242 "//base", |
| 243 "//base:i18n", | 243 "//base:i18n", |
| 244 | |
| 245 "//net", | 244 "//net", |
| 246 "//skia", | 245 "//skia", |
| 247 "//third_party/icu", | 246 "//third_party/icu", |
| 248 "//ui/app_list", | 247 "//ui/app_list", |
| 249 "//ui/aura", | 248 "//ui/aura", |
| 250 "//ui/base", | 249 "//ui/base", |
| 251 "//ui/base/ime", | 250 "//ui/base/ime", |
| 252 "//ui/compositor", | 251 "//ui/compositor", |
| 253 "//ui/events", | 252 "//ui/events", |
| 254 "//ui/events:events_base", | 253 "//ui/events:events_base", |
| 255 "//ui/gfx", | 254 "//ui/gfx", |
| 256 "//ui/gfx/geometry", | 255 "//ui/gfx/geometry", |
| 257 "//ui/keyboard", | 256 "//ui/keyboard", |
| 258 "//ui/keyboard:keyboard_with_content", | 257 "//ui/keyboard:keyboard_with_content", |
| 259 "//ui/message_center", | 258 "//ui/message_center", |
| 260 "//ui/resources", | 259 "//ui/resources", |
| 261 "//ui/views", | 260 "//ui/views", |
| 262 "//ui/views:test_support", | 261 "//ui/views:test_support", |
| 263 "//ui/views/examples:views_examples_lib", | 262 "//ui/views/examples:views_examples_lib", |
| 264 "//ui/views/examples:views_examples_with_content_lib", | 263 "//ui/views/examples:views_examples_with_content_lib", |
| 265 ] | 264 ] |
| 266 } | 265 } |
| 267 | 266 |
| 268 static_library("ash_shell_lib_with_content") { | 267 static_library("ash_shell_lib_with_content") { |
| 269 testonly = true | 268 testonly = true |
| 270 sources = gypi_values.ash_shell_with_content_lib_sources | 269 sources = gypi_values.ash_shell_with_content_lib_sources |
| 271 | 270 |
| 272 deps = [ | 271 deps = [ |
| 273 #"//chrome:packed_resources", TODO(GYP) | 272 #"//chrome:packed_resources", TODO(GYP) |
| 273 ":ash_shell_lib", |
| 274 "//content", | 274 "//content", |
| 275 "//content/shell:content_shell_lib", | 275 "//content/shell:content_shell_lib", |
| 276 ":ash_shell_lib", | |
| 277 "//skia", | 276 "//skia", |
| 278 ] | 277 ] |
| 279 } | 278 } |
| 280 | 279 |
| 281 test("ash_unittests") { | 280 test("ash_unittests") { |
| 282 sources = gypi_values.ash_unittests_sources | 281 sources = gypi_values.ash_unittests_sources |
| 283 configs += [ "//build/config:precompiled_headers" ] | 282 configs += [ "//build/config:precompiled_headers" ] |
| 284 | 283 |
| 285 deps = [ | 284 deps = [ |
| 286 ":ash", | 285 ":ash", |
| 287 ":ash_with_content", | 286 ":ash_with_content", |
| 288 ":test_support", | 287 ":test_support", |
| 289 "//ash/resources", | 288 "//ash/resources", |
| 290 "//ash/strings", | 289 "//ash/strings", |
| 291 "//base", | 290 "//base", |
| 292 "//base/allocator", | 291 "//base/allocator", |
| 293 "//base/test:test_support", | 292 "//base/test:test_support", |
| 294 "//components/signin/core/account_id", | 293 "//components/signin/core/account_id", |
| 295 "//components/user_manager", | 294 "//components/user_manager", |
| 296 "//content/public/browser", | 295 "//content/public/browser", |
| 297 "//content/test:test_support", | 296 "//content/test:test_support", |
| 298 "//skia", | 297 "//skia", |
| 299 "//testing/gtest", | 298 "//testing/gtest", |
| 300 "//third_party/icu", | 299 "//third_party/icu", |
| 301 "//ui/accessibility", | 300 "//ui/accessibility", |
| 302 "//ui/aura", | 301 "//ui/aura", |
| 303 "//ui/aura:test_support", | 302 "//ui/aura:test_support", |
| 304 "//ui/base", | 303 "//ui/base", |
| 304 "//ui/base:test_support", |
| 305 "//ui/base/ime", | 305 "//ui/base/ime", |
| 306 "//ui/base:test_support", | |
| 307 "//ui/compositor", | 306 "//ui/compositor", |
| 308 "//ui/compositor:test_support", | 307 "//ui/compositor:test_support", |
| 309 "//ui/events", | 308 "//ui/events", |
| 309 "//ui/events:gesture_detection", |
| 310 "//ui/events:test_support", |
| 310 "//ui/events/devices", | 311 "//ui/events/devices", |
| 311 "//ui/events:test_support", | |
| 312 "//ui/events:gesture_detection", | |
| 313 "//ui/gfx", | 312 "//ui/gfx", |
| 314 "//ui/gfx/geometry", | 313 "//ui/gfx/geometry", |
| 315 "//ui/keyboard", | 314 "//ui/keyboard", |
| 316 "//ui/keyboard:keyboard_with_content", | 315 "//ui/keyboard:keyboard_with_content", |
| 317 "//ui/message_center", | 316 "//ui/message_center", |
| 318 "//ui/message_center:test_support", | 317 "//ui/message_center:test_support", |
| 319 "//ui/resources", | 318 "//ui/resources", |
| 320 "//ui/views", | 319 "//ui/views", |
| 321 "//ui/views:test_support", | 320 "//ui/views:test_support", |
| 322 "//ui/views/controls/webview:test_support", | 321 "//ui/views/controls/webview:test_support", |
| (...skipping 27 matching lines...) Expand all Loading... |
| 350 } | 349 } |
| 351 | 350 |
| 352 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 351 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
| 353 | 352 |
| 354 if (!use_x11) { | 353 if (!use_x11) { |
| 355 sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ] | 354 sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ] |
| 356 } | 355 } |
| 357 if (is_chromeos) { | 356 if (is_chromeos) { |
| 358 sources += [ "first_run/first_run_helper_unittest.cc" ] | 357 sources += [ "first_run/first_run_helper_unittest.cc" ] |
| 359 deps += [ | 358 deps += [ |
| 359 "//chromeos:power_manager_proto", |
| 360 "//chromeos:test_support_without_gmock", |
| 360 "//device/bluetooth", | 361 "//device/bluetooth", |
| 361 "//ui/display", | 362 "//ui/display", |
| 362 "//ui/display:test_support", | 363 "//ui/display:test_support", |
| 363 "//ui/display:test_util", | 364 "//ui/display:test_util", |
| 364 "//ui/display/types", | 365 "//ui/display/types", |
| 365 "//chromeos:power_manager_proto", | |
| 366 "//chromeos:test_support_without_gmock", | |
| 367 ] | 366 ] |
| 368 } else { | 367 } else { |
| 369 sources -= [ | 368 sources -= [ |
| 370 "accelerators/magnifier_key_scroller_unittest.cc", | 369 "accelerators/magnifier_key_scroller_unittest.cc", |
| 371 "accelerators/spoken_feedback_toggler_unittest.cc", | 370 "accelerators/spoken_feedback_toggler_unittest.cc", |
| 372 "display/resolution_notification_controller_unittest.cc", | 371 "display/resolution_notification_controller_unittest.cc", |
| 373 "touch/touchscreen_util_unittest.cc", | 372 "touch/touchscreen_util_unittest.cc", |
| 374 ] | 373 ] |
| 375 } | 374 } |
| 376 | 375 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 404 configs += [ "//build/config/win:windowed" ] | 403 configs += [ "//build/config/win:windowed" ] |
| 405 deps += [ "//sandbox" ] | 404 deps += [ "//sandbox" ] |
| 406 } | 405 } |
| 407 | 406 |
| 408 if (is_chromeos) { | 407 if (is_chromeos) { |
| 409 deps += [ "//device/bluetooth" ] | 408 deps += [ "//device/bluetooth" ] |
| 410 } | 409 } |
| 411 } | 410 } |
| 412 # When adding support for isolates, please have a look at run-time dependencies | 411 # When adding support for isolates, please have a look at run-time dependencies |
| 413 # in the ash_unittests_run target in ash.gyp. | 412 # in the ash_unittests_run target in ash.gyp. |
| OLD | NEW |