Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Side by Side Diff: chrome/test/BUILD.gn

Issue 2683633003: Revert of Switch mash_browser_tests to Ozone X11 platform. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/app/mash/BUILD.gn ('k') | testing/buildbot/chromium.chromiumos.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 }
1182 } 1178 }
1183 } 1179 }
1184 1180
1185 static_library("browser_tests_runner") { 1181 static_library("browser_tests_runner") {
1186 testonly = true 1182 testonly = true
1187 sources = [] 1183 sources = []
1188 1184
1189 deps = [ 1185 deps = [
1190 ":test_support", 1186 ":test_support",
1191 ] 1187 ]
(...skipping 3975 matching lines...) Expand 10 before | Expand all | Expand 10 after
5167 } 5163 }
5168 5164
5169 if (is_win) { 5165 if (is_win) {
5170 loadable_module("conflicts_dll") { 5166 loadable_module("conflicts_dll") {
5171 testonly = true 5167 testonly = true
5172 sources = [ 5168 sources = [
5173 "conflicts/conflicts_dll.cc", 5169 "conflicts/conflicts_dll.cc",
5174 ] 5170 ]
5175 } 5171 }
5176 } 5172 }
OLDNEW
« no previous file with comments | « chrome/app/mash/BUILD.gn ('k') | testing/buildbot/chromium.chromiumos.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698