| 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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 | 342 |
| 343 # TODO(GYP) is this necessary? | 343 # TODO(GYP) is this necessary? |
| 344 #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { | 344 #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { |
| 345 # ldflags = "-rdynamic" | 345 # ldflags = "-rdynamic" |
| 346 | 346 |
| 347 if (!is_chromeos || use_ozone) { | 347 if (!is_chromeos || use_ozone) { |
| 348 sources -= [ "sticky_keys/sticky_keys_unittest.cc" ] # crbug.com/354035 | 348 sources -= [ "sticky_keys/sticky_keys_unittest.cc" ] # crbug.com/354035 |
| 349 } | 349 } |
| 350 } | 350 } |
| 351 | 351 |
| 352 executable("ash_shell") { | 352 if (!is_win || link_chrome_on_windows) { |
| 353 testonly = true | 353 executable("ash_shell") { |
| 354 sources = [ | 354 testonly = true |
| 355 "shell/shell_main.cc", | 355 sources = [ |
| 356 ] | 356 "shell/shell_main.cc", |
| 357 ] |
| 357 | 358 |
| 358 deps = [ | 359 deps = [ |
| 359 ":ash_shell_lib", | 360 ":ash_shell_lib", |
| 360 "//components/user_manager", | 361 "//components/user_manager", |
| 361 ] | 362 ] |
| 362 | 363 |
| 363 if (is_win) { | 364 if (is_win) { |
| 364 configs -= [ "//build/config/win:console" ] | 365 configs -= [ "//build/config/win:console" ] |
| 365 configs += [ "//build/config/win:windowed" ] | 366 configs += [ "//build/config/win:windowed" ] |
| 366 deps += [ "//sandbox" ] | 367 deps += [ "//sandbox" ] |
| 368 } |
| 369 |
| 370 if (is_chromeos) { |
| 371 deps += [ "//device/bluetooth" ] |
| 372 } |
| 367 } | 373 } |
| 368 | 374 |
| 369 if (is_chromeos) { | 375 test("ash_shell_unittests") { |
| 370 deps += [ "//device/bluetooth" ] | 376 sources = [ |
| 377 "shell/window_watcher_unittest.cc", |
| 378 "test/ash_unittests.cc", |
| 379 ] |
| 380 |
| 381 deps = [ |
| 382 ":ash_shell_lib", |
| 383 ":test_support", |
| 384 "//base/test:test_support", |
| 385 "//components/user_manager", |
| 386 "//content/test:test_support", |
| 387 "//skia", |
| 388 "//testing/gtest", |
| 389 "//ui/accessibility", |
| 390 ] |
| 391 |
| 392 if (is_chromeos) { |
| 393 deps += [ "//ui/display" ] |
| 394 } |
| 371 } | 395 } |
| 372 } | 396 } |
| 373 | |
| 374 test("ash_shell_unittests") { | |
| 375 sources = [ | |
| 376 "shell/window_watcher_unittest.cc", | |
| 377 "test/ash_unittests.cc", | |
| 378 ] | |
| 379 | |
| 380 deps = [ | |
| 381 ":ash_shell_lib", | |
| 382 ":test_support", | |
| 383 "//base/test:test_support", | |
| 384 "//components/user_manager", | |
| 385 "//content/test:test_support", | |
| 386 "//skia", | |
| 387 "//testing/gtest", | |
| 388 "//ui/accessibility", | |
| 389 ] | |
| 390 | |
| 391 if (is_chromeos) { | |
| 392 deps += [ "//ui/display" ] | |
| 393 } | |
| 394 } | |
| OLD | NEW |