Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Side by Side Diff: ash/BUILD.gn

Issue 586213002: Fix a wrong dependency in ash/BUILD.gn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 7
8 gypi_values = exec_script( 8 gypi_values = exec_script(
9 "//build/gypi_to_gn.py", 9 "//build/gypi_to_gn.py",
10 [ rebase_path("ash.gyp") ], 10 [ rebase_path("ash.gyp") ],
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 if (is_win) { 349 if (is_win) {
350 configs -= [ "//build/config/win:console" ] 350 configs -= [ "//build/config/win:console" ]
351 configs += [ "//build/config/win:windowed" ] 351 configs += [ "//build/config/win:windowed" ]
352 deps += [ 352 deps += [
353 "//sandbox", 353 "//sandbox",
354 ] 354 ]
355 } 355 }
356 356
357 if (is_chromeos) { 357 if (is_chromeos) {
358 deps += [ 358 deps += [
359 "../device/bluetooth/bluetooth.gyp:device_bluetooth", 359 "//device/bluetooth",
360 ] 360 ]
361 } 361 }
362 } 362 }
363 363
364 test("ash_shell_unittests") { 364 test("ash_shell_unittests") {
365 sources = [ 365 sources = [
366 "shell/window_watcher_unittest.cc", 366 "shell/window_watcher_unittest.cc",
367 "test/ash_unittests.cc", 367 "test/ash_unittests.cc",
368 ] 368 ]
369 369
370 deps = [ 370 deps = [
371 ":ash_shell_lib", 371 ":ash_shell_lib",
372 ":test_support", 372 ":test_support",
373 "//base/test:test_support", 373 "//base/test:test_support",
374 "//components/user_manager", 374 "//components/user_manager",
375 "//content/test:test_support", 375 "//content/test:test_support",
376 "//skia", 376 "//skia",
377 "//testing/gtest", 377 "//testing/gtest",
378 "//ui/accessibility", 378 "//ui/accessibility",
379 ] 379 ]
380 380
381 if (is_chromeos) { 381 if (is_chromeos) {
382 deps += [ "//ui/display" ] 382 deps += [ "//ui/display" ]
383 } 383 }
384 } 384 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698