Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 { | 5 { |
| 6 'variables' : { | 6 'variables' : { |
| 7 'pyautolib_sources': [ | 7 'pyautolib_sources': [ |
| 8 'app/chrome_command_ids.h', | 8 'app/chrome_command_ids.h', |
| 9 'app/chrome_dll_resource.h', | 9 'app/chrome_dll_resource.h', |
| 10 'common/automation_constants.h', | 10 'common/automation_constants.h', |
| (...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 556 ['OS=="win"', { | 556 ['OS=="win"', { |
| 557 'include_dirs': [ | 557 'include_dirs': [ |
| 558 '../third_party/wtl/include', | 558 '../third_party/wtl/include', |
| 559 ], | 559 ], |
| 560 'dependencies': [ | 560 'dependencies': [ |
| 561 'chrome.gyp:chrome_dll_version', | 561 'chrome.gyp:chrome_dll_version', |
| 562 'chrome.gyp:installer_util_strings', | 562 'chrome.gyp:installer_util_strings', |
| 563 '../sandbox/sandbox.gyp:sandbox', | 563 '../sandbox/sandbox.gyp:sandbox', |
| 564 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', | 564 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', |
| 565 '../third_party/isimpledom/isimpledom.gyp:isimpledom', | 565 '../third_party/isimpledom/isimpledom.gyp:isimpledom', |
| 566 '../ui/ui.gyp:ui_resources', | 566 '../ui/ui.gyp:ui_resources', |
|
cmp
2011/07/01 00:33:22
Is this change from app -> ui a part of the "don't
Sheridan Rawlins
2011/07/01 05:24:36
No, I also did a git pull before this change, so i
| |
| 567 ], | 567 ], |
| 568 'sources': [ | 568 'sources': [ |
| 569 '../webkit/glue/resources/aliasb.cur', | 569 '../webkit/glue/resources/aliasb.cur', |
| 570 '../webkit/glue/resources/cell.cur', | 570 '../webkit/glue/resources/cell.cur', |
| 571 '../webkit/glue/resources/col_resize.cur', | 571 '../webkit/glue/resources/col_resize.cur', |
| 572 '../webkit/glue/resources/copy.cur', | 572 '../webkit/glue/resources/copy.cur', |
| 573 '../webkit/glue/resources/row_resize.cur', | 573 '../webkit/glue/resources/row_resize.cur', |
| 574 '../webkit/glue/resources/vertical_text.cur', | 574 '../webkit/glue/resources/vertical_text.cur', |
| 575 '../webkit/glue/resources/zoom_in.cur', | 575 '../webkit/glue/resources/zoom_in.cur', |
| 576 '../webkit/glue/resources/zoom_out.cur', | 576 '../webkit/glue/resources/zoom_out.cur', |
| (...skipping 1688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2265 # http://crbug.com/64926 | 2265 # http://crbug.com/64926 |
| 2266 ['exclude', '^browser/importer/'], | 2266 ['exclude', '^browser/importer/'], |
| 2267 ], | 2267 ], |
| 2268 }], | 2268 }], |
| 2269 ], | 2269 ], |
| 2270 }, | 2270 }, |
| 2271 { | 2271 { |
| 2272 # Executable that runs each browser test in a new process. | 2272 # Executable that runs each browser test in a new process. |
| 2273 'target_name': 'browser_tests', | 2273 'target_name': 'browser_tests', |
| 2274 'type': 'executable', | 2274 'type': 'executable', |
| 2275 'variables': { | |
| 2276 'gypv8sh': '../tools/gypv8sh.py', | |
| 2277 'js2webui': 'browser/ui/webui/javascript2webui.js', | |
| 2278 'js2webui_out_dir': '<(SHARED_INTERMEDIATE_DIR)/js2webui', | |
| 2279 'rule_input_relpath': 'test/data/webui', | |
| 2280 }, | |
| 2275 'dependencies': [ | 2281 'dependencies': [ |
| 2276 'browser', | 2282 'browser', |
| 2277 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', | 2283 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', |
| 2278 'chrome', | 2284 'chrome', |
| 2279 'chrome_resources', | 2285 'chrome_resources', |
| 2280 'chrome_strings', | 2286 'chrome_strings', |
| 2281 'profile_import', | 2287 'profile_import', |
| 2282 'renderer', | 2288 'renderer', |
| 2283 'test_support_common', | 2289 'test_support_common', |
| 2284 '../app/app.gyp:app_base', | 2290 '../app/app.gyp:app_base', |
| 2285 '../base/base.gyp:base', | 2291 '../base/base.gyp:base', |
| 2286 '../base/base.gyp:base_i18n', | 2292 '../base/base.gyp:base_i18n', |
| 2287 '../base/base.gyp:test_support_base', | 2293 '../base/base.gyp:test_support_base', |
| 2288 '../net/net.gyp:net', | 2294 '../net/net.gyp:net', |
| 2289 '../net/net.gyp:net_test_support', | 2295 '../net/net.gyp:net_test_support', |
| 2290 '../skia/skia.gyp:skia', | 2296 '../skia/skia.gyp:skia', |
| 2291 '../testing/gmock.gyp:gmock', | 2297 '../testing/gmock.gyp:gmock', |
| 2292 '../testing/gtest.gyp:gtest', | 2298 '../testing/gtest.gyp:gtest', |
| 2293 '../third_party/cld/cld.gyp:cld', | 2299 '../third_party/cld/cld.gyp:cld', |
| 2294 '../third_party/icu/icu.gyp:icui18n', | 2300 '../third_party/icu/icu.gyp:icui18n', |
| 2295 '../third_party/icu/icu.gyp:icuuc', | 2301 '../third_party/icu/icu.gyp:icuuc', |
| 2296 '../v8/tools/gyp/v8.gyp:v8', | 2302 '../v8/tools/gyp/v8.gyp:v8', |
| 2297 '../webkit/webkit.gyp:test_shell_test_support', | 2303 '../webkit/webkit.gyp:test_shell_test_support', |
| 2298 # Runtime dependencies | 2304 # Runtime dependencies |
| 2299 '../third_party/mesa/mesa.gyp:osmesa', | 2305 '../third_party/mesa/mesa.gyp:osmesa', |
| 2300 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetsca pePlugIn', | 2306 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetsca pePlugIn', |
| 2301 ], | 2307 ], |
| 2302 'include_dirs': [ | 2308 'include_dirs': [ |
| 2303 '..', | 2309 '..', |
| 2310 '<(js2webui_out_dir)', | |
| 2304 ], | 2311 ], |
| 2305 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ], | 2312 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ], |
| 2306 'sources': [ | 2313 'sources': [ |
| 2307 'app/breakpad_mac_stubs.mm', | 2314 'app/breakpad_mac_stubs.mm', |
| 2308 'app/chrome_command_ids.h', | 2315 'app/chrome_command_ids.h', |
| 2309 'app/chrome_dll.rc', | 2316 'app/chrome_dll.rc', |
| 2310 'app/chrome_dll_resource.h', | 2317 'app/chrome_dll_resource.h', |
| 2311 'app/chrome_dll_version.rc.version', | 2318 'app/chrome_dll_version.rc.version', |
| 2312 'browser/accessibility/renderer_accessibility_browsertest.cc', | 2319 'browser/accessibility/renderer_accessibility_browsertest.cc', |
| 2313 'browser/autocomplete/autocomplete_browsertest.cc', | 2320 'browser/autocomplete/autocomplete_browsertest.cc', |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2526 'renderer/print_web_view_helper_browsertest.cc', | 2533 'renderer/print_web_view_helper_browsertest.cc', |
| 2527 'renderer/safe_browsing/malware_dom_details_browsertest.cc', | 2534 'renderer/safe_browsing/malware_dom_details_browsertest.cc', |
| 2528 'renderer/safe_browsing/phishing_classifier_browsertest.cc', | 2535 'renderer/safe_browsing/phishing_classifier_browsertest.cc', |
| 2529 'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc', | 2536 'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc', |
| 2530 'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc', | 2537 'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc', |
| 2531 'renderer/safe_browsing/phishing_thumbnailer_browsertest.cc', | 2538 'renderer/safe_browsing/phishing_thumbnailer_browsertest.cc', |
| 2532 'renderer/safe_browsing/render_view_fake_resources_test.cc', | 2539 'renderer/safe_browsing/render_view_fake_resources_test.cc', |
| 2533 'renderer/safe_browsing/render_view_fake_resources_test.h', | 2540 'renderer/safe_browsing/render_view_fake_resources_test.h', |
| 2534 'renderer/translate_helper_browsertest.cc', | 2541 'renderer/translate_helper_browsertest.cc', |
| 2535 'test/automation/dom_automation_browsertest.cc', | 2542 'test/automation/dom_automation_browsertest.cc', |
| 2543 'test/data/webui/sample_pass.js', | |
| 2536 'test/gpu/gpu_browsertest.cc', | 2544 'test/gpu/gpu_browsertest.cc', |
| 2537 'test/in_process_browser_test_browsertest.cc', | 2545 'test/in_process_browser_test_browsertest.cc', |
| 2538 'test/out_of_proc_test_runner.cc', | 2546 'test/out_of_proc_test_runner.cc', |
| 2539 'test/render_view_test.cc', | 2547 'test/render_view_test.cc', |
| 2540 'test/render_view_test.h', | 2548 'test/render_view_test.h', |
| 2541 # TODO(craig): Rename this and run from base_unittests when the test | 2549 # TODO(craig): Rename this and run from base_unittests when the test |
| 2542 # is safe to run there. See http://crbug.com/78722 for details. | 2550 # is safe to run there. See http://crbug.com/78722 for details. |
| 2543 '../base/files/file_path_watcher_browsertest.cc', | 2551 '../base/files/file_path_watcher_browsertest.cc', |
| 2544 '../content/browser/child_process_security_policy_browsertest.cc', | 2552 '../content/browser/child_process_security_policy_browsertest.cc', |
| 2545 '../content/browser/device_orientation/device_orientation_browsertest.cc ', | 2553 '../content/browser/device_orientation/device_orientation_browsertest.cc ', |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2709 }, { # else: toolkit_views == 0 | 2717 }, { # else: toolkit_views == 0 |
| 2710 'sources!': [ | 2718 'sources!': [ |
| 2711 'browser/extensions/browser_action_test_util_views.cc', | 2719 'browser/extensions/browser_action_test_util_views.cc', |
| 2712 'browser/ui/panels/panel_browser_view_browsertest.cc', | 2720 'browser/ui/panels/panel_browser_view_browsertest.cc', |
| 2713 'browser/ui/views/browser_actions_container_browsertest.cc', | 2721 'browser/ui/views/browser_actions_container_browsertest.cc', |
| 2714 'browser/ui/views/dom_view_browsertest.cc', | 2722 'browser/ui/views/dom_view_browsertest.cc', |
| 2715 'browser/ui/views/html_dialog_view_browsertest.cc', | 2723 'browser/ui/views/html_dialog_view_browsertest.cc', |
| 2716 ], | 2724 ], |
| 2717 }], | 2725 }], |
| 2718 ['target_arch!="arm"', { | 2726 ['target_arch!="arm"', { |
| 2727 'rules': [ | |
| 2728 { | |
| 2729 'rule_name': 'js2webui', | |
| 2730 'extension': 'js', | |
| 2731 'inputs': [ | |
| 2732 '<(gypv8sh)', | |
| 2733 '<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)', | |
| 2734 '<(js2webui)', | |
| 2735 ], | |
| 2736 'outputs': [ | |
| 2737 '<(js2webui_out_dir)/chrome/<(rule_input_relpath)/<(RULE_INPUT_R OOT)-inl.h', | |
| 2738 ], | |
| 2739 'process_outputs_as_sources': 1, | |
| 2740 'action': [ | |
| 2741 'python', '<@(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', | |
| 2742 ], | |
| 2743 }, | |
| 2744 ], | |
| 2719 'dependencies': [ | 2745 'dependencies': [ |
| 2746 # build time dependency. | |
| 2747 '../v8/tools/gyp/v8.gyp:v8_shell#host', | |
| 2720 # run time dependency | 2748 # run time dependency |
| 2721 '../webkit/webkit.gyp:copy_npapi_test_plugin', | 2749 '../webkit/webkit.gyp:copy_npapi_test_plugin', |
| 2722 ], | 2750 ], |
| 2723 }], | 2751 }], |
| 2724 ], # conditions | 2752 ], # conditions |
| 2725 }, # target browser_tests | 2753 }, # target browser_tests |
| 2726 { | 2754 { |
| 2727 # Executable that runs safebrowsing test in a new process. | 2755 # Executable that runs safebrowsing test in a new process. |
| 2728 'target_name': 'safe_browsing_tests', | 2756 'target_name': 'safe_browsing_tests', |
| 2729 'type': 'executable', | 2757 'type': 'executable', |
| (...skipping 1401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4131 ] | 4159 ] |
| 4132 }], # 'coverage!=0' | 4160 }], # 'coverage!=0' |
| 4133 ], # 'conditions' | 4161 ], # 'conditions' |
| 4134 } | 4162 } |
| 4135 | 4163 |
| 4136 # Local Variables: | 4164 # Local Variables: |
| 4137 # tab-width:2 | 4165 # tab-width:2 |
| 4138 # indent-tabs-mode:nil | 4166 # indent-tabs-mode:nil |
| 4139 # End: | 4167 # End: |
| 4140 # vim: set expandtab tabstop=2 shiftwidth=2: | 4168 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |