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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//chrome/common/features.gni") | 10 import("//chrome/common/features.gni") |
| (...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 312 "//content/test/gpu/run_gpu_integration_test.py", | 312 "//content/test/gpu/run_gpu_integration_test.py", |
| 313 ] | 313 ] |
| 314 } | 314 } |
| 315 | 315 |
| 316 if (!is_android) { | 316 if (!is_android) { |
| 317 static_library("test_support_ui") { | 317 static_library("test_support_ui") { |
| 318 defines = [] | 318 defines = [] |
| 319 testonly = true | 319 testonly = true |
| 320 | 320 |
| 321 sources = [ | 321 sources = [ |
| 322 "../../ui/base/test/use_interactive_test_case.cc", | |
| 323 "../../ui/base/test/use_interactive_test_case.h", | |
|
tapted
2016/10/17 23:44:50
This should go in //ui/base:test_support (i.e. ui
Patti Lor
2016/10/18 03:44:26
Done.
| |
| 324 "../../ui/base/test/use_interactive_test_case_mac.mm", | |
|
tapted
2016/10/17 23:44:50
this probably needs to go in the !is_ios branch (
Patti Lor
2016/10/18 03:44:25
Done (but the other way around, with the .mm in th
Patti Lor
2016/10/18 23:41:48
I went back and double checked everything still wo
tapted
2016/10/18 23:49:19
Ah yep - makes sense. We could put the .mm in the
| |
| 322 "base/in_process_browser_test.cc", | 325 "base/in_process_browser_test.cc", |
| 323 "base/in_process_browser_test.h", | 326 "base/in_process_browser_test.h", |
| 324 "base/in_process_browser_test_mac.cc", | 327 "base/in_process_browser_test_mac.cc", |
| 325 "base/ui_test_utils.cc", | 328 "base/ui_test_utils.cc", |
| 326 "base/ui_test_utils.h", | 329 "base/ui_test_utils.h", |
| 327 ] | 330 ] |
| 328 | 331 |
| 329 configs += [ "//build/config:precompiled_headers" ] | 332 configs += [ "//build/config:precompiled_headers" ] |
| 330 | 333 |
| 331 public_deps = [ | 334 public_deps = [ |
| (...skipping 4692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5024 "touch_hud", | 5027 "touch_hud", |
| 5025 "ui", | 5028 "ui", |
| 5026 ] | 5029 ] |
| 5027 | 5030 |
| 5028 if (is_linux && !is_android) { | 5031 if (is_linux && !is_android) { |
| 5029 deps += [ "//components/font_service:manifest" ] | 5032 deps += [ "//components/font_service:manifest" ] |
| 5030 packaged_services += [ "font_service" ] | 5033 packaged_services += [ "font_service" ] |
| 5031 } | 5034 } |
| 5032 } | 5035 } |
| 5033 } | 5036 } |
| OLD | NEW |