| 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 | 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 "//ui/web_dialogs", | 158 "//ui/web_dialogs", |
| 159 "//url", | 159 "//url", |
| 160 ] | 160 ] |
| 161 | 161 |
| 162 forward_dependent_configs_from = [ | 162 forward_dependent_configs_from = [ |
| 163 ":ash", | 163 ":ash", |
| 164 ] | 164 ] |
| 165 } | 165 } |
| 166 | 166 |
| 167 static_library("test_support") { | 167 static_library("test_support") { |
| 168 testonly = true |
| 168 sources = gypi_values.ash_test_support_sources | 169 sources = gypi_values.ash_test_support_sources |
| 169 | 170 |
| 170 deps = [ | 171 deps = [ |
| 171 ":ash", | 172 ":ash", |
| 172 "//ash/resources", | 173 "//ash/resources", |
| 173 "//content/test:test_support", | 174 "//content/test:test_support", |
| 174 "//skia", | 175 "//skia", |
| 175 "//testing/gtest", | 176 "//testing/gtest", |
| 176 "//ui/accessibility", | 177 "//ui/accessibility", |
| 177 "//ui/app_list", | 178 "//ui/app_list", |
| (...skipping 13 matching lines...) Expand all Loading... |
| 191 "//ipc", | 192 "//ipc", |
| 192 #'../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages', TODO(GYP) | 193 #'../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages', TODO(GYP) |
| 193 #'../win8/win8.gyp:metro_viewer', TODO(GYP) | 194 #'../win8/win8.gyp:metro_viewer', TODO(GYP) |
| 194 #'../win8/win8.gyp:test_support_win8', TODO(GYP) | 195 #'../win8/win8.gyp:test_support_win8', TODO(GYP) |
| 195 #'../win8/win8_tests.gyp:test_registrar', TODO(GYP) | 196 #'../win8/win8_tests.gyp:test_registrar', TODO(GYP) |
| 196 ] | 197 ] |
| 197 } | 198 } |
| 198 } | 199 } |
| 199 | 200 |
| 200 static_library("ash_shell_lib") { | 201 static_library("ash_shell_lib") { |
| 202 testonly = true |
| 201 sources = gypi_values.ash_shell_lib_sources | 203 sources = gypi_values.ash_shell_lib_sources |
| 202 | 204 |
| 203 deps = [ | 205 deps = [ |
| 204 ":ash", | 206 ":ash", |
| 205 ":ash_with_content", | 207 ":ash_with_content", |
| 206 ":test_support", | 208 ":test_support", |
| 207 "//ash/resources", | 209 "//ash/resources", |
| 208 "//ash/strings", | 210 "//ash/strings", |
| 209 "//base", | 211 "//base", |
| 210 "//base:i18n", | 212 "//base:i18n", |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 # ldflags = "-rdynamic" | 333 # ldflags = "-rdynamic" |
| 332 | 334 |
| 333 if (use_ozone) { | 335 if (use_ozone) { |
| 334 sources -= [ | 336 sources -= [ |
| 335 "sticky_keys/sticky_keys_unittest.cc", # crbug.com/354035 | 337 "sticky_keys/sticky_keys_unittest.cc", # crbug.com/354035 |
| 336 ] | 338 ] |
| 337 } | 339 } |
| 338 } | 340 } |
| 339 | 341 |
| 340 executable("ash_shell") { | 342 executable("ash_shell") { |
| 343 testonly = true |
| 341 sources = [ | 344 sources = [ |
| 342 "shell/shell_main.cc", | 345 "shell/shell_main.cc", |
| 343 ] | 346 ] |
| 344 | 347 |
| 345 deps = [ | 348 deps = [ |
| 346 ":ash_shell_lib", | 349 ":ash_shell_lib", |
| 347 "//components/user_manager", | 350 "//components/user_manager", |
| 348 ] | 351 ] |
| 349 | 352 |
| 350 if (is_win) { | 353 if (is_win) { |
| (...skipping 25 matching lines...) Expand all Loading... |
| 376 "//testing/gtest", | 379 "//testing/gtest", |
| 377 "//ui/aaccessibility", | 380 "//ui/aaccessibility", |
| 378 ] | 381 ] |
| 379 | 382 |
| 380 if (is_chromeos) { | 383 if (is_chromeos) { |
| 381 deps += [ "//ui/display" ] | 384 deps += [ "//ui/display" ] |
| 382 } | 385 } |
| 383 } | 386 } |
| 384 | 387 |
| 385 } # if false | 388 } # if false |
| OLD | NEW |