Chromium Code Reviews| 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("//build/gypi_to_gn.py", | 8 gypi_values = exec_script("//build/gypi_to_gn.py", |
| 9 [ rebase_path("ash.gyp") ], | 9 [ rebase_path("ash.gyp") ], |
| 10 "scope", | 10 "scope", |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 173 "//ui/views:test_support", | 173 "//ui/views:test_support", |
| 174 ] | 174 ] |
| 175 | 175 |
| 176 if (is_win) { | 176 if (is_win) { |
| 177 sources += [ | 177 sources += [ |
| 178 "test/test_metro_viewer_process_host.cc", | 178 "test/test_metro_viewer_process_host.cc", |
| 179 "test/test_metro_viewer_process_host.h", | 179 "test/test_metro_viewer_process_host.h", |
| 180 ] | 180 ] |
| 181 deps += [ | 181 deps += [ |
| 182 "//ipc", | 182 "//ipc", |
| 183 #'../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages', TODO(GYP) | 183 "//ui/metro_viewer", |
|
Slava Chigrin
2014/12/23 12:40:18
Seems, this target already added to the GN build.
| |
| 184 #'../win8/win8.gyp:metro_viewer', TODO(GYP) | 184 "//win8:metro_viewer", |
| 185 #'../win8/win8.gyp:test_support_win8', TODO(GYP) | 185 "//win8:test_support_win8", |
| 186 #'../win8/win8_tests.gyp:test_registrar', TODO(GYP) | 186 "//win8:test_registrar", |
| 187 ] | 187 ] |
| 188 } | 188 } |
| 189 } | 189 } |
| 190 | 190 |
| 191 static_library("ash_shell_lib") { | 191 static_library("ash_shell_lib") { |
| 192 testonly = true | 192 testonly = true |
| 193 sources = gypi_values.ash_shell_lib_sources | 193 sources = gypi_values.ash_shell_lib_sources |
| 194 | 194 |
| 195 deps = [ | 195 deps = [ |
| 196 ":ash", | 196 ":ash", |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 368 "//content/test:test_support", | 368 "//content/test:test_support", |
| 369 "//skia", | 369 "//skia", |
| 370 "//testing/gtest", | 370 "//testing/gtest", |
| 371 "//ui/accessibility", | 371 "//ui/accessibility", |
| 372 ] | 372 ] |
| 373 | 373 |
| 374 if (is_chromeos) { | 374 if (is_chromeos) { |
| 375 deps += [ "//ui/display" ] | 375 deps += [ "//ui/display" ] |
| 376 } | 376 } |
| 377 } | 377 } |
| OLD | NEW |