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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 9699054: rlz: Hook up on mac, switch to chrome's network stack on win. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 2329 matching lines...) Expand 10 before | Expand all | Expand 10 after
2340 'dependencies': [ 2340 'dependencies': [
2341 'chrome_resources.gyp:packed_extra_resources', 2341 'chrome_resources.gyp:packed_extra_resources',
2342 'chrome_resources.gyp:packed_resources', 2342 'chrome_resources.gyp:packed_resources',
2343 'convert_dict_lib', 2343 'convert_dict_lib',
2344 '../third_party/hunspell/hunspell.gyp:hunspell', 2344 '../third_party/hunspell/hunspell.gyp:hunspell',
2345 ], 2345 ],
2346 'sources!': [ 2346 'sources!': [
2347 'browser/spellchecker/spellchecker_platform_engine_unittest.cc', 2347 'browser/spellchecker/spellchecker_platform_engine_unittest.cc',
2348 ], 2348 ],
2349 }], 2349 }],
2350 ['OS!="win" and OS!="mac"', {
2351 'sources!': [
2352 'browser/rlz/rlz_unittest.cc',
2353 ],
2354 }],
2350 ['OS=="win"', { 2355 ['OS=="win"', {
2351 'dependencies': [ 2356 'dependencies': [
2352 'chrome_version_resources', 2357 'chrome_version_resources',
2353 'installer_util_strings', 2358 'installer_util_strings',
2354 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 2359 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
2355 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 2360 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
2356 ], 2361 ],
2357 'conditions': [ 2362 'conditions': [
2358 ['win_use_allocator_shim==1', { 2363 ['win_use_allocator_shim==1', {
2359 'dependencies': [ 2364 'dependencies': [
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
2401 'LinkIncremental': '1', 2406 'LinkIncremental': '1',
2402 }, 2407 },
2403 }, 2408 },
2404 }, 2409 },
2405 }, 2410 },
2406 }, { # else: OS != "win" 2411 }, { # else: OS != "win"
2407 'sources!': [ 2412 'sources!': [
2408 'app/chrome_dll.rc', 2413 'app/chrome_dll.rc',
2409 'browser/accessibility/browser_accessibility_win_unittest.cc', 2414 'browser/accessibility/browser_accessibility_win_unittest.cc',
2410 'browser/bookmarks/bookmark_node_data_unittest.cc', 2415 'browser/bookmarks/bookmark_node_data_unittest.cc',
2411 'browser/rlz/rlz_unittest.cc',
2412 'browser/search_engines/template_url_scraper_unittest.cc', 2416 'browser/search_engines/template_url_scraper_unittest.cc',
2413 'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc', 2417 'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc',
2414 'browser/ui/views/extensions/browser_action_drag_data_unittest.cc', 2418 'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
2415 'browser/ui/views/first_run_search_engine_view_unittest.cc', 2419 'browser/ui/views/first_run_search_engine_view_unittest.cc',
2416 'browser/ui/views/generic_info_view_unittest.cc', 2420 'browser/ui/views/generic_info_view_unittest.cc',
2417 'test/data/resource.rc', 2421 'test/data/resource.rc',
2418 ], 2422 ],
2419 }], 2423 }],
2420 ['OS=="android"', { 2424 ['OS=="android"', {
2421 'sources!': [ 2425 'sources!': [
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
3064 'browser/extensions/browser_action_test_util_gtk.cc', 3068 'browser/extensions/browser_action_test_util_gtk.cc',
3065 'browser/ui/gtk/view_id_util_browsertest.cc', 3069 'browser/ui/gtk/view_id_util_browsertest.cc',
3066 ], 3070 ],
3067 }], 3071 }],
3068 ['OS=="linux"', { 3072 ['OS=="linux"', {
3069 'sources!': [ 3073 'sources!': [
3070 '../content/browser/accessibility/dump_accessibility_tree_browsertes t.cc', 3074 '../content/browser/accessibility/dump_accessibility_tree_browsertes t.cc',
3071 '../content/browser/accessibility/dump_accessibility_tree_helper.cc' , 3075 '../content/browser/accessibility/dump_accessibility_tree_helper.cc' ,
3072 ], 3076 ],
3073 }], 3077 }],
3078 ['OS!="win" and OS!="mac"', {
3079 'sources!': [
3080 'browser/rlz/rlz_extension_apitest.cc',
3081 ],
3082 }],
3074 ['OS=="win"', { 3083 ['OS=="win"', {
3075 'sources': [ 3084 'sources': [
3076 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3085 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3077 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3086 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3078 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 3087 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
3079 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 3088 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
3080 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 3089 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
3081 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 3090 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3082 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 3091 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
3083 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 3092 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
(...skipping 26 matching lines...) Expand all
3110 }, 3119 },
3111 }, 3120 },
3112 }, 3121 },
3113 } 3122 }
3114 }, { # else: OS != "win" 3123 }, { # else: OS != "win"
3115 'sources!': [ 3124 'sources!': [
3116 'app/chrome_command_ids.h', 3125 'app/chrome_command_ids.h',
3117 'app/chrome_dll.rc', 3126 'app/chrome_dll.rc',
3118 'app/chrome_dll_resource.h', 3127 'app/chrome_dll_resource.h',
3119 'app/chrome_version.rc.version', 3128 'app/chrome_version.rc.version',
3120 'browser/rlz/rlz_extension_apitest.cc',
3121 ], 3129 ],
3122 }], 3130 }],
3123 ['toolkit_uses_gtk == 1', { 3131 ['toolkit_uses_gtk == 1', {
3124 'dependencies': [ 3132 'dependencies': [
3125 '../build/linux/system.gyp:gtk', 3133 '../build/linux/system.gyp:gtk',
3126 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 3134 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
3127 ], 3135 ],
3128 'sources': [ 3136 'sources': [
3129 # TODO(estade): port to win/mac. 3137 # TODO(estade): port to win/mac.
3130 'browser/ui/webui/constrained_html_ui_browsertest.cc', 3138 'browser/ui/webui/constrained_html_ui_browsertest.cc',
(...skipping 1462 matching lines...) Expand 10 before | Expand all | Expand 10 after
4593 # Use outputs of this action as inputs for the main target build. 4601 # Use outputs of this action as inputs for the main target build.
4594 # Seems as a misnomer but makes this happy on Linux (scons). 4602 # Seems as a misnomer but makes this happy on Linux (scons).
4595 'process_outputs_as_sources': 1, 4603 'process_outputs_as_sources': 1,
4596 }, 4604 },
4597 ], # 'actions' 4605 ], # 'actions'
4598 }, 4606 },
4599 ] 4607 ]
4600 }], # 'coverage!=0' 4608 }], # 'coverage!=0'
4601 ], # 'conditions' 4609 ], # 'conditions'
4602 } 4610 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698