| 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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 testonly = true | 173 testonly = true |
| 174 sources = gypi_values.ash_test_support_sources | 174 sources = gypi_values.ash_test_support_sources |
| 175 configs += [ "//build/config:precompiled_headers" ] | 175 configs += [ "//build/config:precompiled_headers" ] |
| 176 | 176 |
| 177 public_deps = [ | 177 public_deps = [ |
| 178 ":ash", | 178 ":ash", |
| 179 ] | 179 ] |
| 180 deps = [ | 180 deps = [ |
| 181 ":test_support_with_content", # TODO(beng): reverse this direction. | 181 ":test_support_with_content", # TODO(beng): reverse this direction. |
| 182 "//ash/resources", | 182 "//ash/resources", |
| 183 "//components/signin/core/account_id", |
| 183 "//skia", | 184 "//skia", |
| 184 "//testing/gtest", | 185 "//testing/gtest", |
| 185 "//ui/accessibility", | 186 "//ui/accessibility", |
| 186 "//ui/app_list", | 187 "//ui/app_list", |
| 187 "//ui/app_list:test_support", | 188 "//ui/app_list:test_support", |
| 188 "//ui/events:events_base", | 189 "//ui/events:events_base", |
| 189 "//ui/events/devices", | 190 "//ui/events/devices", |
| 190 "//ui/gl", | 191 "//ui/gl", |
| 191 "//ui/views", | 192 "//ui/views", |
| 192 "//ui/views:test_support", | 193 "//ui/views:test_support", |
| 193 ] | 194 ] |
| 194 | 195 |
| 195 if (is_win) { | 196 if (is_win) { |
| 196 deps += [ "//ui/platform_window/win" ] | 197 deps += [ "//ui/platform_window/win" ] |
| 197 } | 198 } |
| 199 |
| 200 if (is_chromeos) { |
| 201 deps += [ "//ui/display" ] |
| 202 } |
| 198 } | 203 } |
| 199 | 204 |
| 200 source_set("test_support_with_content") { | 205 source_set("test_support_with_content") { |
| 201 testonly = true | 206 testonly = true |
| 202 sources = gypi_values.ash_test_support_with_content_sources | 207 sources = gypi_values.ash_test_support_with_content_sources |
| 203 configs += [ "//build/config:precompiled_headers" ] | 208 configs += [ "//build/config:precompiled_headers" ] |
| 204 | 209 |
| 205 deps = [ | 210 deps = [ |
| 206 ":ash_with_content", | 211 ":ash_with_content", |
| 207 "//content/test:test_support", | 212 "//content/test:test_support", |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 configs += [ "//build/config/win:windowed" ] | 407 configs += [ "//build/config/win:windowed" ] |
| 403 deps += [ "//sandbox" ] | 408 deps += [ "//sandbox" ] |
| 404 } | 409 } |
| 405 | 410 |
| 406 if (is_chromeos) { | 411 if (is_chromeos) { |
| 407 deps += [ "//device/bluetooth" ] | 412 deps += [ "//device/bluetooth" ] |
| 408 } | 413 } |
| 409 } | 414 } |
| 410 # When adding support for isolates, please have a look at run-time dependencies | 415 # When adding support for isolates, please have a look at run-time dependencies |
| 411 # in the ash_unittests_run target in ash.gyp. | 416 # in the ash_unittests_run target in ash.gyp. |
| OLD | NEW |