| 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 import("//ui/base/ui_features.gni") | 8 import("//ui/base/ui_features.gni") |
| 9 | 9 |
| 10 assert(use_aura) | 10 assert(use_aura) |
| 11 assert(enable_hidpi) | 11 assert(enable_hidpi) |
| 12 | 12 |
| 13 gypi_values = exec_script("//build/gypi_to_gn.py", | 13 gypi_values = exec_script("//build/gypi_to_gn.py", |
| 14 [ rebase_path("ash.gyp") ], | 14 [ rebase_path("ash.gyp") ], |
| 15 "scope", | 15 "scope", |
| 16 [ "ash.gyp" ]) | 16 [ "ash.gyp" ]) |
| 17 | 17 |
| 18 component("ash") { | 18 component("ash") { |
| 19 sources = gypi_values.ash_sources | 19 sources = gypi_values.ash_sources |
| 20 | 20 |
| 21 configs += [ "//build/config:precompiled_headers" ] | 21 configs += [ "//build/config:precompiled_headers" ] |
| 22 defines = [ "ASH_IMPLEMENTATION" ] | 22 defines = [ "ASH_IMPLEMENTATION" ] |
| 23 | 23 |
| 24 public_deps = [ | 24 public_deps = [ |
| 25 "//ash/common/strings", |
| 25 "//ash/resources", | 26 "//ash/resources", |
| 26 "//ash/strings", | |
| 27 ] | 27 ] |
| 28 deps = [ | 28 deps = [ |
| 29 "//ash/touch_hud", | 29 "//ash/touch_hud", |
| 30 "//base", | 30 "//base", |
| 31 "//base:i18n", | 31 "//base:i18n", |
| 32 "//base/third_party/dynamic_annotations", | 32 "//base/third_party/dynamic_annotations", |
| 33 "//cc", | 33 "//cc", |
| 34 "//components/device_event_log", | 34 "//components/device_event_log", |
| 35 "//components/onc", | 35 "//components/onc", |
| 36 "//components/signin/core/account_id", | 36 "//components/signin/core/account_id", |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 } | 274 } |
| 275 | 275 |
| 276 static_library("ash_shell_lib") { | 276 static_library("ash_shell_lib") { |
| 277 testonly = true | 277 testonly = true |
| 278 sources = gypi_values.ash_shell_lib_sources | 278 sources = gypi_values.ash_shell_lib_sources |
| 279 | 279 |
| 280 deps = [ | 280 deps = [ |
| 281 ":ash", | 281 ":ash", |
| 282 ":ash_with_content", | 282 ":ash_with_content", |
| 283 ":test_support", | 283 ":test_support", |
| 284 "//ash/common/strings", |
| 284 "//ash/resources", | 285 "//ash/resources", |
| 285 "//ash/strings", | |
| 286 "//base", | 286 "//base", |
| 287 "//base:i18n", | 287 "//base:i18n", |
| 288 "//components/user_manager", | 288 "//components/user_manager", |
| 289 "//net", | 289 "//net", |
| 290 "//skia", | 290 "//skia", |
| 291 "//third_party/icu", | 291 "//third_party/icu", |
| 292 "//ui/app_list/presenter", | 292 "//ui/app_list/presenter", |
| 293 "//ui/aura", | 293 "//ui/aura", |
| 294 "//ui/base", | 294 "//ui/base", |
| 295 "//ui/base/ime", | 295 "//ui/base/ime", |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 | 341 |
| 342 test("ash_unittests") { | 342 test("ash_unittests") { |
| 343 sources = gypi_values.ash_unittests_sources | 343 sources = gypi_values.ash_unittests_sources |
| 344 configs += [ "//build/config:precompiled_headers" ] | 344 configs += [ "//build/config:precompiled_headers" ] |
| 345 | 345 |
| 346 deps = [ | 346 deps = [ |
| 347 ":ash", | 347 ":ash", |
| 348 ":ash_with_content", | 348 ":ash_with_content", |
| 349 ":test_support", | 349 ":test_support", |
| 350 ":test_support_with_content", | 350 ":test_support_with_content", |
| 351 "//ash/common/strings", |
| 351 "//ash/resources", | 352 "//ash/resources", |
| 352 "//ash/strings", | |
| 353 "//ash/touch_hud", | 353 "//ash/touch_hud", |
| 354 "//base", | 354 "//base", |
| 355 "//base/test:test_support", | 355 "//base/test:test_support", |
| 356 "//components/signin/core/account_id", | 356 "//components/signin/core/account_id", |
| 357 "//components/user_manager", | 357 "//components/user_manager", |
| 358 "//content/public/browser", | 358 "//content/public/browser", |
| 359 "//content/test:test_support", | 359 "//content/test:test_support", |
| 360 "//mojo/edk/system", | 360 "//mojo/edk/system", |
| 361 "//skia", | 361 "//skia", |
| 362 "//testing/gtest", | 362 "//testing/gtest", |
| (...skipping 23 matching lines...) Expand all Loading... |
| 386 "//ui/views", | 386 "//ui/views", |
| 387 "//ui/views:test_support", | 387 "//ui/views:test_support", |
| 388 "//ui/views/controls/webview:test_support", | 388 "//ui/views/controls/webview:test_support", |
| 389 "//ui/web_dialogs:test_support", | 389 "//ui/web_dialogs:test_support", |
| 390 "//ui/wm", | 390 "//ui/wm", |
| 391 "//ui/wm:test_support", | 391 "//ui/wm:test_support", |
| 392 "//url", | 392 "//url", |
| 393 ] | 393 ] |
| 394 | 394 |
| 395 data_deps = [ | 395 data_deps = [ |
| 396 "//ash/strings:ash_test_strings", | 396 "//ash/common/strings:ash_test_strings", |
| 397 "//ash/resources:ash_test_resources_100_percent", | 397 "//ash/resources:ash_test_resources_100_percent", |
| 398 "//ash/resources:ash_test_resources_200_percent", | 398 "//ash/resources:ash_test_resources_200_percent", |
| 399 ] | 399 ] |
| 400 | 400 |
| 401 if (!is_chromeos) { | 401 if (!is_chromeos) { |
| 402 sources -= [ | 402 sources -= [ |
| 403 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 | 403 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 |
| 404 "focus_cycler_unittest.cc", | 404 "focus_cycler_unittest.cc", |
| 405 | 405 |
| 406 # All tests for multiple displays: not supported on Windows Ash. | 406 # All tests for multiple displays: not supported on Windows Ash. |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 468 ":ash_shell_lib_with_content", | 468 ":ash_shell_lib_with_content", |
| 469 "//base", | 469 "//base", |
| 470 "//build/config/sanitizers:deps", | 470 "//build/config/sanitizers:deps", |
| 471 "//build/win:default_exe_manifest", | 471 "//build/win:default_exe_manifest", |
| 472 "//components/user_manager", | 472 "//components/user_manager", |
| 473 "//content", | 473 "//content", |
| 474 "//content/public/app:both", | 474 "//content/public/app:both", |
| 475 ] | 475 ] |
| 476 | 476 |
| 477 data_deps = [ | 477 data_deps = [ |
| 478 "//ash/strings:ash_test_strings", | 478 "//ash/common/strings:ash_test_strings", |
| 479 "//ash/resources:ash_test_resources_100_percent", | 479 "//ash/resources:ash_test_resources_100_percent", |
| 480 "//ash/resources:ash_test_resources_200_percent", | 480 "//ash/resources:ash_test_resources_200_percent", |
| 481 ] | 481 ] |
| 482 | 482 |
| 483 if (is_win) { | 483 if (is_win) { |
| 484 configs -= [ "//build/config/win:console" ] | 484 configs -= [ "//build/config/win:console" ] |
| 485 configs += [ "//build/config/win:windowed" ] | 485 configs += [ "//build/config/win:windowed" ] |
| 486 deps += [ "//sandbox" ] | 486 deps += [ "//sandbox" ] |
| 487 } | 487 } |
| 488 | 488 |
| 489 if (is_chromeos) { | 489 if (is_chromeos) { |
| 490 deps += [ "//device/bluetooth" ] | 490 deps += [ "//device/bluetooth" ] |
| 491 } | 491 } |
| 492 } | 492 } |
| 493 # When adding support for isolates, please have a look at run-time dependencies | 493 # When adding support for isolates, please have a look at run-time dependencies |
| 494 # in the ash_unittests_run target in ash.gyp. | 494 # in the ash_unittests_run target in ash.gyp. |
| OLD | NEW |