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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 22914014: Add more control over sync for Chromium testshell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed findbugs Created 7 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 | Annotate | Revision Log
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'variables' : { 5 'variables' : {
6 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 3324 matching lines...) Expand 10 before | Expand all | Expand 10 after
3335 { 3335 {
3336 'target_name': 'chrome_java_test_support', 3336 'target_name': 'chrome_java_test_support',
3337 'type': 'none', 3337 'type': 'none',
3338 'variables': { 3338 'variables': {
3339 'package_name': 'chrome_java_test_support', 3339 'package_name': 'chrome_java_test_support',
3340 'java_in_dir': '../chrome/test/android/javatests', 3340 'java_in_dir': '../chrome/test/android/javatests',
3341 }, 3341 },
3342 'dependencies': [ 3342 'dependencies': [
3343 'chrome_java', 3343 'chrome_java',
3344 '../content/content.gyp:content_java_test_support', 3344 '../content/content.gyp:content_java_test_support',
3345 '../sync/sync.gyp:sync_java',
3346 '../sync/sync.gyp:sync_java_test_support',
3345 ], 3347 ],
3346 'includes': [ '../build/java.gypi' ], 3348 'includes': [ '../build/java.gypi' ],
3347 }, 3349 },
3348 ], 3350 ],
3349 }], 3351 }],
3350 ['test_isolation_mode != "noop"', { 3352 ['test_isolation_mode != "noop"', {
3351 'targets': [ 3353 'targets': [
3352 { 3354 {
3353 'target_name': 'browser_tests_run', 3355 'target_name': 'browser_tests_run',
3354 'type': 'none', 3356 'type': 'none',
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
3454 'utility', 3456 'utility',
3455 ], 3457 ],
3456 'sources': [ 3458 'sources': [
3457 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3459 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3458 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3460 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3459 ], 3461 ],
3460 }] 3462 }]
3461 }], 3463 }],
3462 ], # 'conditions' 3464 ], # 'conditions'
3463 } 3465 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698