| 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 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1187 sources += [ | 1187 sources += [ |
| 1188 "base/browser_tests_main_chromeos.cc", | 1188 "base/browser_tests_main_chromeos.cc", |
| 1189 "base/mash_browser_tests_main.cc", | 1189 "base/mash_browser_tests_main.cc", |
| 1190 "base/mash_browser_tests_main.h", | 1190 "base/mash_browser_tests_main.h", |
| 1191 "base/mojo_test_connector.cc", | 1191 "base/mojo_test_connector.cc", |
| 1192 "base/mojo_test_connector.h", | 1192 "base/mojo_test_connector.h", |
| 1193 ] | 1193 ] |
| 1194 | 1194 |
| 1195 deps += [ | 1195 deps += [ |
| 1196 "//mash/package", | 1196 "//mash/package", |
| 1197 "//mash/session/public/interfaces:constants", |
| 1197 "//services/service_manager/background:lib", | 1198 "//services/service_manager/background:lib", |
| 1198 ] | 1199 ] |
| 1199 | 1200 |
| 1200 data_deps = [ | 1201 data_deps = [ |
| 1201 ":mash_browser_tests_catalog_copy", | 1202 ":mash_browser_tests_catalog_copy", |
| 1202 "//mash/session", | 1203 "//mash/session", |
| 1203 ] | 1204 ] |
| 1204 } else { | 1205 } else { |
| 1205 sources += [ "base/browser_tests_main.cc" ] | 1206 sources += [ "base/browser_tests_main.cc" ] |
| 1206 } | 1207 } |
| (...skipping 3985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5192 } | 5193 } |
| 5193 | 5194 |
| 5194 if (is_win) { | 5195 if (is_win) { |
| 5195 loadable_module("conflicts_dll") { | 5196 loadable_module("conflicts_dll") { |
| 5196 testonly = true | 5197 testonly = true |
| 5197 sources = [ | 5198 sources = [ |
| 5198 "conflicts/conflicts_dll.cc", | 5199 "conflicts/conflicts_dll.cc", |
| 5199 ] | 5200 ] |
| 5200 } | 5201 } |
| 5201 } | 5202 } |
| OLD | NEW |