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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome_frame_ie fix Created 7 years, 6 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
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome_frame/chrome_frame.gyp » ('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 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 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 # Although this one is probably safe to ignore. 511 # Although this one is probably safe to ignore.
512 # Mongose casts -1 directly as HANDLE (definitely safe to ignore). 512 # Mongose casts -1 directly as HANDLE (definitely safe to ignore).
513 'msvs_disabled_warnings': [4267, 4306, ], 513 'msvs_disabled_warnings': [4267, 4306, ],
514 }, 514 },
515 { 515 {
516 # chromedriver is the chromium implementation of WebDriver. 516 # chromedriver is the chromium implementation of WebDriver.
517 # See http://www.chromium.org/developers/testing/webdriver-for-chrome 517 # See http://www.chromium.org/developers/testing/webdriver-for-chrome
518 'target_name': 'chromedriver_lib', 518 'target_name': 'chromedriver_lib',
519 'type': 'static_library', 519 'type': 'static_library',
520 'dependencies': [ 520 'dependencies': [
521 'browser',
522 'chrome',
523 'chrome_resources.gyp:chrome_resources',
524 'chrome_resources.gyp:chrome_strings',
525 'chromedriver_support',
526 'common',
527 'test_support_ui',
528 'test_support_ui_runner',
529 '../base/base.gyp:base', 521 '../base/base.gyp:base',
530 '../build/temp_gyp/googleurl.gyp:googleurl',
531 '../net/net.gyp:net', 522 '../net/net.gyp:net',
532 '../skia/skia.gyp:skia', 523 '../skia/skia.gyp:skia',
533 '../sync/sync.gyp:sync', 524 '../sync/sync.gyp:sync',
534 '../testing/gtest.gyp:gtest', 525 '../testing/gtest.gyp:gtest',
535 '../third_party/icu/icu.gyp:icui18n', 526 '../third_party/icu/icu.gyp:icui18n',
536 '../third_party/icu/icu.gyp:icuuc', 527 '../third_party/icu/icu.gyp:icuuc',
537 '../third_party/libxml/libxml.gyp:libxml', 528 '../third_party/libxml/libxml.gyp:libxml',
529 '../url/url.gyp:url_lib',
530 'browser',
531 'chrome',
532 'chrome_resources.gyp:chrome_resources',
533 'chrome_resources.gyp:chrome_strings',
534 'chromedriver_support',
535 'common',
536 'test_support_ui',
537 'test_support_ui_runner',
538 ], 538 ],
539 'include_dirs': [ 539 'include_dirs': [
540 '..', 540 '..',
541 ], 541 ],
542 'sources': [ 542 'sources': [
543 'test/webdriver/commands/alert_commands.cc', 543 'test/webdriver/commands/alert_commands.cc',
544 'test/webdriver/commands/alert_commands.h', 544 'test/webdriver/commands/alert_commands.h',
545 'test/webdriver/commands/appcache_status_command.cc', 545 'test/webdriver/commands/appcache_status_command.cc',
546 'test/webdriver/commands/appcache_status_command.h', 546 'test/webdriver/commands/appcache_status_command.h',
547 'test/webdriver/commands/browser_connection_commands.cc', 547 'test/webdriver/commands/browser_connection_commands.cc',
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 }], 762 }],
763 ], 763 ],
764 }, 764 },
765 { 765 {
766 'target_name': 'chrome_devtools_lib', 766 'target_name': 'chrome_devtools_lib',
767 'type': 'static_library', 767 'type': 'static_library',
768 'hard_dependency': 1, 768 'hard_dependency': 1,
769 'dependencies': [ 769 'dependencies': [
770 '../base/base.gyp:base', 770 '../base/base.gyp:base',
771 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 771 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
772 '../build/temp_gyp/googleurl.gyp:googleurl',
773 '../net/net.gyp:net', 772 '../net/net.gyp:net',
774 '../third_party/zlib/zlib.gyp:minizip', 773 '../third_party/zlib/zlib.gyp:minizip',
775 '../third_party/zlib/zlib.gyp:zlib', 774 '../third_party/zlib/zlib.gyp:zlib',
776 '../ui/ui.gyp:ui', 775 '../ui/ui.gyp:ui',
776 '../url/url.gyp:url_lib',
777 ], 777 ],
778 'include_dirs': [ 778 'include_dirs': [
779 '..', 779 '..',
780 '<(SHARED_INTERMEDIATE_DIR)', 780 '<(SHARED_INTERMEDIATE_DIR)',
781 ], 781 ],
782 'direct_dependent_settings': { 782 'direct_dependent_settings': {
783 'include_dirs': [ 783 'include_dirs': [
784 '<(SHARED_INTERMEDIATE_DIR)', 784 '<(SHARED_INTERMEDIATE_DIR)',
785 ], 785 ],
786 }, 786 },
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 ], 1106 ],
1107 }], 1107 }],
1108 ], 1108 ],
1109 }, 1109 },
1110 # ChromeDriver2 tests that aren't run on the main buildbot. Available 1110 # ChromeDriver2 tests that aren't run on the main buildbot. Available
1111 # as an optional test type on trybots. 1111 # as an optional test type on trybots.
1112 { 1112 {
1113 'target_name': 'chromedriver2_tests', 1113 'target_name': 'chromedriver2_tests',
1114 'type': 'executable', 1114 'type': 'executable',
1115 'dependencies': [ 1115 'dependencies': [
1116 'chromedriver2_lib',
1117 '../base/base.gyp:base', 1116 '../base/base.gyp:base',
1118 '../base/base.gyp:run_all_unittests', 1117 '../base/base.gyp:run_all_unittests',
1119 '../build/temp_gyp/googleurl.gyp:googleurl',
1120 '../net/net.gyp:http_server', 1118 '../net/net.gyp:http_server',
1121 '../net/net.gyp:net', 1119 '../net/net.gyp:net',
1122 '../net/net.gyp:net_test_support', 1120 '../net/net.gyp:net_test_support',
1123 '../testing/gtest.gyp:gtest', 1121 '../testing/gtest.gyp:gtest',
1122 '../url/url.gyp:url_lib',
1123 'chromedriver2_lib',
1124 ], 1124 ],
1125 'include_dirs': [ 1125 'include_dirs': [
1126 '..,' 1126 '..,'
1127 ], 1127 ],
1128 'sources': [ 1128 'sources': [
1129 'test/chromedriver/key_converter_unittest.cc', 1129 'test/chromedriver/key_converter_unittest.cc',
1130 'test/chromedriver/keycode_text_conversion_unittest.cc', 1130 'test/chromedriver/keycode_text_conversion_unittest.cc',
1131 'test/chromedriver/net/net_util_unittest.cc', 1131 'test/chromedriver/net/net_util_unittest.cc',
1132 'test/chromedriver/net/sync_websocket_impl_unittest.cc', 1132 'test/chromedriver/net/sync_websocket_impl_unittest.cc',
1133 'test/chromedriver/net/test_http_server.cc', 1133 'test/chromedriver/net/test_http_server.cc',
(...skipping 2261 matching lines...) Expand 10 before | Expand all | Expand 10 after
3395 # more details. 3395 # more details.
3396 'DebugInformationFormat': '3', 3396 'DebugInformationFormat': '3',
3397 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb', 3397 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb',
3398 }, 3398 },
3399 }, 3399 },
3400 }, 3400 },
3401 ], 3401 ],
3402 }], 3402 }],
3403 ], # 'conditions' 3403 ], # 'conditions'
3404 } 3404 }
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome_frame/chrome_frame.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698