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