| 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 } | 1168 } |
| 1169 | 1169 |
| 1170 static_library("browser_tests_runner") { | 1170 static_library("browser_tests_runner") { |
| 1171 testonly = true | 1171 testonly = true |
| 1172 sources = [] | 1172 sources = [] |
| 1173 | 1173 |
| 1174 deps = [ | 1174 deps = [ |
| 1175 ":test_support", | 1175 ":test_support", |
| 1176 ] | 1176 ] |
| 1177 | 1177 |
| 1178 if (enable_package_mash_services) { | 1178 if (is_chromeos && enable_package_mash_services) { |
| 1179 sources += [ | 1179 sources += [ |
| 1180 "base/browser_tests_main_chromeos.cc", | 1180 "base/browser_tests_main_chromeos.cc", |
| 1181 "base/mash_browser_tests_main.cc", | 1181 "base/mash_browser_tests_main.cc", |
| 1182 "base/mash_browser_tests_main.h", | 1182 "base/mash_browser_tests_main.h", |
| 1183 "base/mojo_test_connector.cc", | 1183 "base/mojo_test_connector.cc", |
| 1184 "base/mojo_test_connector.h", | 1184 "base/mojo_test_connector.h", |
| 1185 ] | 1185 ] |
| 1186 | 1186 |
| 1187 deps += [ | 1187 deps += [ |
| 1188 "//mash/package", | 1188 "//mash/package", |
| (...skipping 3920 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5109 android_library("unit_tests_java") { | 5109 android_library("unit_tests_java") { |
| 5110 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] | 5110 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] |
| 5111 deps = [ | 5111 deps = [ |
| 5112 "//base:base_java", | 5112 "//base:base_java", |
| 5113 "//chrome/android:chrome_java", | 5113 "//chrome/android:chrome_java", |
| 5114 "//content/public/android:content_java", | 5114 "//content/public/android:content_java", |
| 5115 ] | 5115 ] |
| 5116 } | 5116 } |
| 5117 } | 5117 } |
| 5118 | 5118 |
| 5119 if (enable_package_mash_services) { | 5119 if (is_chromeos && enable_package_mash_services) { |
| 5120 # TODO(GYP_GONE): Delete this after we've converted everything to GN. | 5120 # TODO(GYP_GONE): Delete this after we've converted everything to GN. |
| 5121 # The _run targets exist only for compatibility w/ GYP. | 5121 # The _run targets exist only for compatibility w/ GYP. |
| 5122 group("mash_browser_tests_run") { | 5122 group("mash_browser_tests_run") { |
| 5123 testonly = true | 5123 testonly = true |
| 5124 deps = [ | 5124 deps = [ |
| 5125 ":mash_browser_tests", | 5125 ":mash_browser_tests", |
| 5126 ] | 5126 ] |
| 5127 } | 5127 } |
| 5128 | 5128 |
| 5129 group("mash_browser_tests") { | 5129 group("mash_browser_tests") { |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5175 } | 5175 } |
| 5176 | 5176 |
| 5177 if (is_win) { | 5177 if (is_win) { |
| 5178 loadable_module("conflicts_dll") { | 5178 loadable_module("conflicts_dll") { |
| 5179 testonly = true | 5179 testonly = true |
| 5180 sources = [ | 5180 sources = [ |
| 5181 "conflicts/conflicts_dll.cc", | 5181 "conflicts/conflicts_dll.cc", |
| 5182 ] | 5182 ] |
| 5183 } | 5183 } |
| 5184 } | 5184 } |
| OLD | NEW |