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

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

Issue 2697933002: Remove factory methods from ChromeApplication. (Closed)
Patch Set: Rebase Created 3 years, 9 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/android/java_sources.gni ('k') | no next file » | 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 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after
1286 "//ppapi/native_client:irt", 1286 "//ppapi/native_client:irt",
1287 ] 1287 ]
1288 } 1288 }
1289 1289
1290 deps += [ "//chrome/browser/chromeos:test_support" ] 1290 deps += [ "//chrome/browser/chromeos:test_support" ]
1291 } 1291 }
1292 1292
1293 # TODO(jbudorick): In progress. See crbug.com/611756 1293 # TODO(jbudorick): In progress. See crbug.com/611756
1294 if (is_android) { 1294 if (is_android) {
1295 deps += [ 1295 deps += [
1296 "//chrome/android:app_hooks_java",
1296 "//chrome/android:chrome_java", 1297 "//chrome/android:chrome_java",
1297 "//v8:v8_external_startup_data_assets", 1298 "//v8:v8_external_startup_data_assets",
1298 ] 1299 ]
1299 1300
1300 enable_multidex = true 1301 enable_multidex = true
1301 } else { # Not Android. 1302 } else { # Not Android.
1302 sources += [ 1303 sources += [
1303 # The list of sources which is only used by chrome browser tests on 1304 # The list of sources which is only used by chrome browser tests on
1304 # desktop platforms. 1305 # desktop platforms.
1305 "../../apps/app_restore_service_browsertest.cc", 1306 "../../apps/app_restore_service_browsertest.cc",
(...skipping 3807 matching lines...) Expand 10 before | Expand all | Expand 10 after
5113 "//chrome/install_static/test:test_support", 5114 "//chrome/install_static/test:test_support",
5114 ] 5115 ]
5115 } 5116 }
5116 } 5117 }
5117 5118
5118 if (is_android) { 5119 if (is_android) {
5119 android_library("unit_tests_java") { 5120 android_library("unit_tests_java") {
5120 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] 5121 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ]
5121 deps = [ 5122 deps = [
5122 "//base:base_java", 5123 "//base:base_java",
5124 "//chrome/android:app_hooks_java",
5123 "//chrome/android:chrome_java", 5125 "//chrome/android:chrome_java",
5124 "//content/public/android:content_java", 5126 "//content/public/android:content_java",
5125 ] 5127 ]
5126 } 5128 }
5127 } 5129 }
5128 5130
5129 if (is_chromeos && enable_package_mash_services) { 5131 if (is_chromeos && enable_package_mash_services) {
5130 # TODO(GYP_GONE): Delete this after we've converted everything to GN. 5132 # TODO(GYP_GONE): Delete this after we've converted everything to GN.
5131 # The _run targets exist only for compatibility w/ GYP. 5133 # The _run targets exist only for compatibility w/ GYP.
5132 group("mash_browser_tests_run") { 5134 group("mash_browser_tests_run") {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
5185 } 5187 }
5186 5188
5187 if (is_win) { 5189 if (is_win) {
5188 loadable_module("conflicts_dll") { 5190 loadable_module("conflicts_dll") {
5189 testonly = true 5191 testonly = true
5190 sources = [ 5192 sources = [
5191 "conflicts/conflicts_dll.cc", 5193 "conflicts/conflicts_dll.cc",
5192 ] 5194 ]
5193 } 5195 }
5194 } 5196 }
OLDNEW
« no previous file with comments | « chrome/android/java_sources.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698