| 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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 "//ui/views/examples:views_examples_lib", | 266 "//ui/views/examples:views_examples_lib", |
| 267 "//ui/views/examples:views_examples_with_content_lib", | 267 "//ui/views/examples:views_examples_with_content_lib", |
| 268 ] | 268 ] |
| 269 } | 269 } |
| 270 | 270 |
| 271 static_library("ash_shell_lib_with_content") { | 271 static_library("ash_shell_lib_with_content") { |
| 272 testonly = true | 272 testonly = true |
| 273 sources = gypi_values.ash_shell_with_content_lib_sources | 273 sources = gypi_values.ash_shell_with_content_lib_sources |
| 274 | 274 |
| 275 deps = [ | 275 deps = [ |
| 276 #"//chrome:packed_resources", TODO(GYP) | |
| 277 ":ash_shell_lib", | 276 ":ash_shell_lib", |
| 277 "//chrome:packed_resources", |
| 278 "//content", | 278 "//content", |
| 279 "//content/shell:content_shell_lib", | 279 "//content/shell:content_shell_lib", |
| 280 "//skia", | 280 "//skia", |
| 281 ] | 281 ] |
| 282 } | 282 } |
| 283 | 283 |
| 284 test("ash_unittests") { | 284 test("ash_unittests") { |
| 285 sources = gypi_values.ash_unittests_sources | 285 sources = gypi_values.ash_unittests_sources |
| 286 configs += [ "//build/config:precompiled_headers" ] | 286 configs += [ "//build/config:precompiled_headers" ] |
| 287 | 287 |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 configs += [ "//build/config/win:windowed" ] | 407 configs += [ "//build/config/win:windowed" ] |
| 408 deps += [ "//sandbox" ] | 408 deps += [ "//sandbox" ] |
| 409 } | 409 } |
| 410 | 410 |
| 411 if (is_chromeos) { | 411 if (is_chromeos) { |
| 412 deps += [ "//device/bluetooth" ] | 412 deps += [ "//device/bluetooth" ] |
| 413 } | 413 } |
| 414 } | 414 } |
| 415 # 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 |
| 416 # in the ash_unittests_run target in ash.gyp. | 416 # in the ash_unittests_run target in ash.gyp. |
| OLD | NEW |