| 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 "//ui/events:events_base", | 189 "//ui/events:events_base", |
| 190 "//ui/events/devices", | 190 "//ui/events/devices", |
| 191 "//ui/gl", | 191 "//ui/gl", |
| 192 "//ui/views", | 192 "//ui/views", |
| 193 "//ui/views:test_support", | 193 "//ui/views:test_support", |
| 194 ] | 194 ] |
| 195 | 195 |
| 196 if (is_win) { | 196 if (is_win) { |
| 197 deps += [ "//ui/platform_window/win" ] | 197 deps += [ "//ui/platform_window/win" ] |
| 198 } | 198 } |
| 199 |
| 200 if (is_chromeos) { |
| 201 deps += [ "//ui/display" ] |
| 202 } |
| 199 } | 203 } |
| 200 | 204 |
| 201 source_set("test_support_with_content") { | 205 source_set("test_support_with_content") { |
| 202 testonly = true | 206 testonly = true |
| 203 sources = gypi_values.ash_test_support_with_content_sources | 207 sources = gypi_values.ash_test_support_with_content_sources |
| 204 configs += [ "//build/config:precompiled_headers" ] | 208 configs += [ "//build/config:precompiled_headers" ] |
| 205 | 209 |
| 206 deps = [ | 210 deps = [ |
| 207 ":ash_with_content", | 211 ":ash_with_content", |
| 208 "//content/test:test_support", | 212 "//content/test:test_support", |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 configs += [ "//build/config/win:windowed" ] | 408 configs += [ "//build/config/win:windowed" ] |
| 405 deps += [ "//sandbox" ] | 409 deps += [ "//sandbox" ] |
| 406 } | 410 } |
| 407 | 411 |
| 408 if (is_chromeos) { | 412 if (is_chromeos) { |
| 409 deps += [ "//device/bluetooth" ] | 413 deps += [ "//device/bluetooth" ] |
| 410 } | 414 } |
| 411 } | 415 } |
| 412 # When adding support for isolates, please have a look at run-time dependencies | 416 # When adding support for isolates, please have a look at run-time dependencies |
| 413 # in the ash_unittests_run target in ash.gyp. | 417 # in the ash_unittests_run target in ash.gyp. |
| OLD | NEW |