| 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 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1168 deps = [ | 1168 deps = [ |
| 1169 ":mash_browser_tests", | 1169 ":mash_browser_tests", |
| 1170 ] | 1170 ] |
| 1171 } | 1171 } |
| 1172 | 1172 |
| 1173 group("mash_browser_tests") { | 1173 group("mash_browser_tests") { |
| 1174 testonly = true | 1174 testonly = true |
| 1175 data_deps = [ | 1175 data_deps = [ |
| 1176 ":browser_tests", | 1176 ":browser_tests", |
| 1177 ] | 1177 ] |
| 1178 |
| 1179 if (use_aura) { |
| 1180 data_deps += [ "//chrome/app/mash:mash_service_overrides" ] |
| 1181 } |
| 1178 } | 1182 } |
| 1179 } | 1183 } |
| 1180 | 1184 |
| 1181 static_library("browser_tests_runner") { | 1185 static_library("browser_tests_runner") { |
| 1182 testonly = true | 1186 testonly = true |
| 1183 sources = [] | 1187 sources = [] |
| 1184 | 1188 |
| 1185 deps = [ | 1189 deps = [ |
| 1186 ":test_support", | 1190 ":test_support", |
| 1187 ] | 1191 ] |
| (...skipping 3975 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5163 } | 5167 } |
| 5164 | 5168 |
| 5165 if (is_win) { | 5169 if (is_win) { |
| 5166 loadable_module("conflicts_dll") { | 5170 loadable_module("conflicts_dll") { |
| 5167 testonly = true | 5171 testonly = true |
| 5168 sources = [ | 5172 sources = [ |
| 5169 "conflicts/conflicts_dll.cc", | 5173 "conflicts/conflicts_dll.cc", |
| 5170 ] | 5174 ] |
| 5171 } | 5175 } |
| 5172 } | 5176 } |
| OLD | NEW |