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

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

Issue 709683004: components: add wifi_sync component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@submit-1-security-class
Patch Set: fix android_aosp build Created 6 years 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/common/chrome_switches.cc ('k') | components/BUILD.gn » ('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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 7
8 # This target exists to reference other test executables to bring these files 8 # This target exists to reference other test executables to bring these files
9 # into the build. 9 # into the build.
10 group("test") { 10 group("test") {
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 "../browser/sync/test/integration/dictionary_load_observer.cc", 247 "../browser/sync/test/integration/dictionary_load_observer.cc",
248 "../browser/sync/test/integration/dictionary_load_observer.h", 248 "../browser/sync/test/integration/dictionary_load_observer.h",
249 ] 249 ]
250 } 250 }
251 if (!enable_app_list) { 251 if (!enable_app_list) {
252 sources -= [ 252 sources -= [
253 "../browser/sync/test/integration/sync_app_list_helper.cc", 253 "../browser/sync/test/integration/sync_app_list_helper.cc",
254 "../browser/sync/test/integration/sync_app_list_helper.h", 254 "../browser/sync/test/integration/sync_app_list_helper.h",
255 ] 255 ]
256 } 256 }
257 if (!is_chromeos) {
258 sources -= [
259 "../browser/sync/test/integration/wifi_credentials_helper.cc",
260 "../browser/sync/test/integration/wifi_credentials_helper.h",
261 ]
262 }
257 } 263 }
258 264
259 test("sync_integration_tests") { 265 test("sync_integration_tests") {
260 sources = 266 sources =
261 rebase_path(gypi_values.sync_integration_tests_sources, ".", "//chrome") 267 rebase_path(gypi_values.sync_integration_tests_sources, ".", "//chrome")
262 268
263 # TODO(phajdan.jr): Only temporary, to make transition easier. 269 # TODO(phajdan.jr): Only temporary, to make transition easier.
264 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] 270 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
265 271
266 deps = [ 272 deps = [
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 # '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 312 # '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
307 # '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', 313 # '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
308 #] 314 #]
309 deps += [ 315 deps += [
310 "//third_party/wtl", 316 "//third_party/wtl",
311 #'chrome_version_resources', TODO(GYP) 317 #'chrome_version_resources', TODO(GYP)
312 ] 318 ]
313 } else { 319 } else {
314 sources -= [ "../app/chrome_version.rc.version" ] 320 sources -= [ "../app/chrome_version.rc.version" ]
315 } 321 }
322 if (!is_chromeos) {
323 sources -= [
324 "../browser/sync/test/integration/single_client_wifi_credentials_sync_te st.cc",
325 "../browser/sync/test/integration/two_client_wifi_credentials_sync_test. cc",
326 ]
327 }
316 328
317 if (toolkit_views) { 329 if (toolkit_views) {
318 deps += [ "//ui/views" ] 330 deps += [ "//ui/views" ]
319 } 331 }
320 if (enable_basic_printing || enable_print_preview) { 332 if (enable_basic_printing || enable_print_preview) {
321 deps += [ "//printing" ] 333 deps += [ "//printing" ]
322 } 334 }
323 if (!enable_app_list) { 335 if (!enable_app_list) {
324 sources -= [ 336 sources -= [
325 "../browser/sync/test/integration/single_client_app_list_sync_test.cc", 337 "../browser/sync/test/integration/single_client_app_list_sync_test.cc",
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 # TODO(GYP) CDM adapter stuff. 407 # TODO(GYP) CDM adapter stuff.
396 #if (enable_pepper_cdms) { 408 #if (enable_pepper_cdms) {
397 # deps += [ 409 # deps += [
398 # "//media/cdm/ppapi:clearkeycdmadapter", 410 # "//media/cdm/ppapi:clearkeycdmadapter",
399 # "//ppapi:ppapi_cpp", 411 # "//ppapi:ppapi_cpp",
400 # "//third_party/widevine/cdm:adapter", 412 # "//third_party/widevine/cdm:adapter",
401 # ] 413 # ]
402 #} 414 #}
403 } 415 }
404 } 416 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | components/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698