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

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

Issue 2298323002: Makes chrome data_dep specific to chromeos (Closed)
Patch Set: revert synced to tip of tree Created 4 years, 3 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
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/chrome_tests.gni") 10 import("//chrome/chrome_tests.gni")
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 } 221 }
222 222
223 if (use_ash) { 223 if (use_ash) {
224 sources += [ 224 sources += [
225 "base/default_ash_event_generator_delegate.cc", 225 "base/default_ash_event_generator_delegate.cc",
226 "base/default_ash_event_generator_delegate.h", 226 "base/default_ash_event_generator_delegate.h",
227 ] 227 ]
228 228
229 public_deps += [ 229 public_deps += [
230 "//ash", 230 "//ash",
231 "//ash:test_support", 231 "//ash:test_support_without_content",
232 "//ui/aura", 232 "//ui/aura",
233 "//ui/aura:test_support", 233 "//ui/aura:test_support",
234 ] 234 ]
235 } 235 }
236 if (toolkit_views) { 236 if (toolkit_views) {
237 public_deps += [ "//ui/views:test_support" ] 237 public_deps += [ "//ui/views:test_support" ]
238 } 238 }
239 239
240 if (enable_extensions) { 240 if (enable_extensions) {
241 public_deps += [ 241 public_deps += [
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 "//extensions:chrome_extensions_browsertests", 1147 "//extensions:chrome_extensions_browsertests",
1148 "//extensions/common/api", 1148 "//extensions/common/api",
1149 ] 1149 ]
1150 } 1150 }
1151 1151
1152 if (use_ash) { 1152 if (use_ash) {
1153 sources += 1153 sources +=
1154 rebase_path(chrome_tests_gypi_values.chrome_browser_tests_ash_sources, 1154 rebase_path(chrome_tests_gypi_values.chrome_browser_tests_ash_sources,
1155 ".", 1155 ".",
1156 "//chrome") 1156 "//chrome")
1157 deps += [ "//ash:test_support" ] 1157 deps += [ "//ash:test_support_without_content" ]
1158 1158
1159 if (enable_app_list) { 1159 if (enable_app_list) {
1160 deps += [ ":test_support_applist_ash" ] 1160 deps += [ ":test_support_applist_ash" ]
1161 } 1161 }
1162 } 1162 }
1163 if (use_aura || toolkit_views) { 1163 if (use_aura || toolkit_views) {
1164 deps += [ "//ui/events:test_support" ] 1164 deps += [ "//ui/events:test_support" ]
1165 } 1165 }
1166 if (toolkit_views) { 1166 if (toolkit_views) {
1167 sources += rebase_path( 1167 sources += rebase_path(
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after
1956 ".", 1956 ".",
1957 "//chrome") 1957 "//chrome")
1958 } 1958 }
1959 } 1959 }
1960 if (use_ash) { 1960 if (use_ash) {
1961 sources += 1961 sources +=
1962 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources, 1962 rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources,
1963 ".", 1963 ".",
1964 "//chrome") 1964 "//chrome")
1965 deps += [ 1965 deps += [
1966 "//ash:test_support", 1966 "//ash:test_support_with_content",
1967 "//ash/common/strings", 1967 "//ash/common/strings",
1968 "//ash/resources", 1968 "//ash/resources",
1969 ] 1969 ]
1970 1970
1971 # We eventually want to compile both in Win Aura builds, see 1971 # We eventually want to compile both in Win Aura builds, see
1972 # http://crbug.com/155545. 1972 # http://crbug.com/155545.
1973 if (!is_win) { 1973 if (!is_win) {
1974 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ] 1974 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ]
1975 } 1975 }
1976 } 1976 }
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
2102 } 2102 }
2103 if (is_chromeos) { 2103 if (is_chromeos) {
2104 deps += [ 2104 deps += [
2105 "//chrome/browser/chromeos:unit_tests", 2105 "//chrome/browser/chromeos:unit_tests",
2106 "//chromeos/ime:gencode", 2106 "//chromeos/ime:gencode",
2107 ] 2107 ]
2108 sources -= [ 2108 sources -= [
2109 "../browser/policy/cloud/user_policy_signin_service_unittest.cc", 2109 "../browser/policy/cloud/user_policy_signin_service_unittest.cc",
2110 "../browser/signin/signin_manager_unittest.cc", 2110 "../browser/signin/signin_manager_unittest.cc",
2111 ] 2111 ]
2112 sources += [
2113 "base/ash_test_environment_chrome.cc",
2114 "base/ash_test_environment_chrome.h",
2115 ]
2112 } 2116 }
2113 if (use_x11) { 2117 if (use_x11) {
2114 deps += [ "//ui/events/devices" ] 2118 deps += [ "//ui/events/devices" ]
2115 data_deps += [ "//tools/xdisplaycheck" ] 2119 data_deps += [ "//tools/xdisplaycheck" ]
2116 } else { 2120 } else {
2117 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ] 2121 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
2118 } 2122 }
2119 if (use_gnome_keyring && current_cpu == "x64") { 2123 if (use_gnome_keyring && current_cpu == "x64") {
2120 # Only add this test for 64 bit builds because otherwise we need the 32 2124 # Only add this test for 64 bit builds because otherwise we need the 32
2121 # bit library on 64 bit systems when running this test. 2125 # bit library on 64 bit systems when running this test.
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
2504 "touch_hud", 2508 "touch_hud",
2505 "ui", 2509 "ui",
2506 ] 2510 ]
2507 2511
2508 if (is_linux && !is_android) { 2512 if (is_linux && !is_android) {
2509 deps += [ "//components/font_service:manifest" ] 2513 deps += [ "//components/font_service:manifest" ]
2510 packaged_services += [ "font_service" ] 2514 packaged_services += [ "font_service" ]
2511 } 2515 }
2512 } 2516 }
2513 } 2517 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698