| 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") ], | 
| 11                           "scope", | 11                           "scope", | 
| 12                           [ "ash.gyp" ]) | 12                           [ "ash.gyp" ]) | 
| 13 | 13 | 
| 14 component("ash") { | 14 component("ash") { | 
| 15   sources = gypi_values.ash_sources | 15   sources = gypi_values.ash_sources | 
| 16 | 16 | 
| 17   configs += [ "//build/config:precompiled_headers" ] |  | 
| 18   defines = [ "ASH_IMPLEMENTATION" ] | 17   defines = [ "ASH_IMPLEMENTATION" ] | 
| 19 | 18 | 
| 20   public_deps = [ | 19   public_deps = [ | 
| 21     "//ash/resources", | 20     "//ash/resources", | 
| 22     "//ash/strings", | 21     "//ash/strings", | 
| 23   ] | 22   ] | 
| 24   deps = [ | 23   deps = [ | 
| 25     "//base", | 24     "//base", | 
| 26     "//base:i18n", | 25     "//base:i18n", | 
| 27     "//base/third_party/dynamic_annotations", | 26     "//base/third_party/dynamic_annotations", | 
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 167     "//ui/gfx/geometry", | 166     "//ui/gfx/geometry", | 
| 168     "//ui/resources", | 167     "//ui/resources", | 
| 169     "//ui/strings", | 168     "//ui/strings", | 
| 170     "//ui/views", | 169     "//ui/views", | 
| 171     "//ui/views/controls/webview", | 170     "//ui/views/controls/webview", | 
| 172     "//ui/web_dialogs", | 171     "//ui/web_dialogs", | 
| 173     "//url", | 172     "//url", | 
| 174   ] | 173   ] | 
| 175 } | 174 } | 
| 176 | 175 | 
| 177 source_set("test_support") { | 176 static_library("test_support") { | 
| 178   testonly = true | 177   testonly = true | 
| 179   sources = gypi_values.ash_test_support_sources | 178   sources = gypi_values.ash_test_support_sources | 
| 180   configs += [ "//build/config:precompiled_headers" ] |  | 
| 181 | 179 | 
| 182   public_deps = [ | 180   public_deps = [ | 
| 183     ":ash", | 181     ":ash", | 
| 184   ] | 182   ] | 
| 185   deps = [ | 183   deps = [ | 
| 186     "//ash/resources", | 184     "//ash/resources", | 
| 187     "//content/test:test_support", | 185     "//content/test:test_support", | 
| 188     "//skia", | 186     "//skia", | 
| 189     "//testing/gtest", | 187     "//testing/gtest", | 
| 190     "//ui/accessibility", | 188     "//ui/accessibility", | 
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 246     "//ui/resources", | 244     "//ui/resources", | 
| 247     "//ui/views", | 245     "//ui/views", | 
| 248     "//ui/views:test_support", | 246     "//ui/views:test_support", | 
| 249     "//ui/views/examples:views_examples_lib", | 247     "//ui/views/examples:views_examples_lib", | 
| 250     "//ui/views/examples:views_examples_with_content_lib", | 248     "//ui/views/examples:views_examples_with_content_lib", | 
| 251   ] | 249   ] | 
| 252 } | 250 } | 
| 253 | 251 | 
| 254 test("ash_unittests") { | 252 test("ash_unittests") { | 
| 255   sources = gypi_values.ash_unittests_sources | 253   sources = gypi_values.ash_unittests_sources | 
| 256   configs += [ "//build/config:precompiled_headers" ] |  | 
| 257 | 254 | 
| 258   deps = [ | 255   deps = [ | 
| 259     ":ash", | 256     ":ash", | 
| 260     ":ash_with_content", | 257     ":ash_with_content", | 
| 261     ":test_support", | 258     ":test_support", | 
| 262     "//ash/resources", | 259     "//ash/resources", | 
| 263     "//ash/strings", | 260     "//ash/strings", | 
| 264     "//base", | 261     "//base", | 
| 265     "//base/allocator", | 262     "//base/allocator", | 
| 266     "//base/test:test_support", | 263     "//base/test:test_support", | 
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 395     "//testing/gtest", | 392     "//testing/gtest", | 
| 396     "//ui/accessibility", | 393     "//ui/accessibility", | 
| 397   ] | 394   ] | 
| 398 | 395 | 
| 399   if (is_chromeos) { | 396   if (is_chromeos) { | 
| 400     deps += [ "//ui/display" ] | 397     deps += [ "//ui/display" ] | 
| 401   } | 398   } | 
| 402 } | 399 } | 
| 403 # When adding support for isolates, please have a look at run-time dependencies | 400 # When adding support for isolates, please have a look at run-time dependencies | 
| 404 # in the ash_unittests_run target in ash.gyp. | 401 # in the ash_unittests_run target in ash.gyp. | 
| OLD | NEW | 
|---|