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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 12096116: Enable dictionary sync by default (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge master Created 7 years, 10 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 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 2216 matching lines...) Expand 10 before | Expand all | Expand 10 after
2227 }], 2227 }],
2228 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , { 2228 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , {
2229 'dependencies': [ 2229 'dependencies': [
2230 '../build/linux/system.gyp:ssl', 2230 '../build/linux/system.gyp:ssl',
2231 ], 2231 ],
2232 }], 2232 }],
2233 ['OS=="mac"', { 2233 ['OS=="mac"', {
2234 # The sync_integration_tests do not run on mac without this flag. 2234 # The sync_integration_tests do not run on mac without this flag.
2235 # Search for comments about "xcode_settings" elsewhere in this file. 2235 # Search for comments about "xcode_settings" elsewhere in this file.
2236 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 2236 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
2237 # Dictionary sync is disabled on Mac.
2238 'sources!': [
2239 'browser/sync/test/integration/dictionary_helper.cc',
2240 'browser/sync/test/integration/dictionary_helper.h',
2241 'browser/sync/test/integration/dictionary_load_observer.cc',
2242 'browser/sync/test/integration/dictionary_load_observer.h',
2243 'browser/sync/test/integration/multiple_client_dictionary_sync_test. cc',
2244 'browser/sync/test/integration/single_client_dictionary_sync_test.cc ',
2245 'browser/sync/test/integration/two_client_dictionary_sync_test.cc',
2246 ],
2237 }], 2247 }],
2238 ['OS=="win"', { 2248 ['OS=="win"', {
2239 'sources': [ 2249 'sources': [
2240 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2250 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2241 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc', 2251 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
2242 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2252 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2243 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 2253 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
2244 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2254 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2245 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 2255 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
2246 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2256 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
2352 }], 2362 }],
2353 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , { 2363 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , {
2354 'dependencies': [ 2364 'dependencies': [
2355 '../build/linux/system.gyp:ssl', 2365 '../build/linux/system.gyp:ssl',
2356 ], 2366 ],
2357 }], 2367 }],
2358 ['OS=="mac"', { 2368 ['OS=="mac"', {
2359 # The sync_performance_tests do not run on mac without this flag. 2369 # The sync_performance_tests do not run on mac without this flag.
2360 # Search for comments about "xcode_settings" elsewhere in this file. 2370 # Search for comments about "xcode_settings" elsewhere in this file.
2361 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 2371 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
2372 # Dictionary sync is disabled on Mac.
2373 'sources!': [
2374 'browser/sync/test/integration/dictionary_helper.cc',
2375 'browser/sync/test/integration/dictionary_helper.h',
2376 'browser/sync/test/integration/dictionary_load_observer.cc',
2377 'browser/sync/test/integration/dictionary_load_observer.h',
2378 'browser/sync/test/integration/performance/dictionary_sync_perf_test .cc',
2379 ],
2362 }], 2380 }],
2363 ['OS=="win"', { 2381 ['OS=="win"', {
2364 'sources': [ 2382 'sources': [
2365 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2383 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2366 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc', 2384 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
2367 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2385 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2368 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 2386 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
2369 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2387 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2370 ], 2388 ],
2371 'include_dirs': [ 2389 'include_dirs': [
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
3079 # more details. 3097 # more details.
3080 'DebugInformationFormat': '3', 3098 'DebugInformationFormat': '3',
3081 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb', 3099 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb',
3082 }, 3100 },
3083 }, 3101 },
3084 }, 3102 },
3085 ], 3103 ],
3086 }], 3104 }],
3087 ], # 'conditions' 3105 ], # 'conditions'
3088 } 3106 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698