| 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 '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 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 624 # See comment about the same line in chrome/chrome_tests.gypi. | 624 # See comment about the same line in chrome/chrome_tests.gypi. |
| 625 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 625 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 626 }], # OS=="mac" | 626 }], # OS=="mac" |
| 627 ['notifications==0', { | 627 ['notifications==0', { |
| 628 'sources/': [ | 628 'sources/': [ |
| 629 ['exclude', '^browser/notifications/'], | 629 ['exclude', '^browser/notifications/'], |
| 630 ], | 630 ], |
| 631 }], | 631 }], |
| 632 ['toolkit_views==1', { | 632 ['toolkit_views==1', { |
| 633 'dependencies': [ | 633 'dependencies': [ |
| 634 '../views/views.gyp:views', | 634 '../ui/views/views.gyp:views', |
| 635 ], | 635 ], |
| 636 }], | 636 }], |
| 637 ['chromeos==1', { | 637 ['chromeos==1', { |
| 638 'sources!': [ | 638 'sources!': [ |
| 639 'browser/ui/panels/panel_browsertest.cc', | 639 'browser/ui/panels/panel_browsertest.cc', |
| 640 ], | 640 ], |
| 641 }], | 641 }], |
| 642 ['OS=="win"', { | 642 ['OS=="win"', { |
| 643 'include_dirs': [ | 643 'include_dirs': [ |
| 644 '../third_party/wtl/include', | 644 '../third_party/wtl/include', |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 826 '../build/linux/system.gyp:gtk', | 826 '../build/linux/system.gyp:gtk', |
| 827 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 827 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 828 ], | 828 ], |
| 829 }, { # else: toolkit_uses_gtk != 1 | 829 }, { # else: toolkit_uses_gtk != 1 |
| 830 'sources!': [ | 830 'sources!': [ |
| 831 'browser/process_singleton_linux_uitest.cc', | 831 'browser/process_singleton_linux_uitest.cc', |
| 832 ], | 832 ], |
| 833 }], | 833 }], |
| 834 ['toolkit_views==1', { | 834 ['toolkit_views==1', { |
| 835 'dependencies': [ | 835 'dependencies': [ |
| 836 '../views/views.gyp:views', | 836 '../ui/views/views.gyp:views', |
| 837 ], | 837 ], |
| 838 }], | 838 }], |
| 839 ['use_aura==1', { | 839 ['use_aura==1', { |
| 840 'sources!': [ | 840 'sources!': [ |
| 841 'test/automation/automation_proxy_uitest.cc', | 841 'test/automation/automation_proxy_uitest.cc', |
| 842 'test/ui/npapi_uitest.cc', | 842 'test/ui/npapi_uitest.cc', |
| 843 'browser/default_plugin_uitest.cc', | 843 'browser/default_plugin_uitest.cc', |
| 844 ], | 844 ], |
| 845 'dependencies': [ | 845 'dependencies': [ |
| 846 '../ui/aura/aura.gyp:aura', | 846 '../ui/aura/aura.gyp:aura', |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1031 ], | 1031 ], |
| 1032 'conditions': [ | 1032 'conditions': [ |
| 1033 ['toolkit_uses_gtk == 1', { | 1033 ['toolkit_uses_gtk == 1', { |
| 1034 'dependencies': [ | 1034 'dependencies': [ |
| 1035 '../build/linux/system.gyp:gtk', | 1035 '../build/linux/system.gyp:gtk', |
| 1036 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 1036 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 1037 ], | 1037 ], |
| 1038 }], | 1038 }], |
| 1039 ['OS=="linux" and toolkit_views==1', { | 1039 ['OS=="linux" and toolkit_views==1', { |
| 1040 'dependencies': [ | 1040 'dependencies': [ |
| 1041 '../views/views.gyp:views', | 1041 '../ui/views/views.gyp:views', |
| 1042 ], | 1042 ], |
| 1043 }], | 1043 }], |
| 1044 ['os_posix == 1 and OS != "mac"', { | 1044 ['os_posix == 1 and OS != "mac"', { |
| 1045 'conditions': [ | 1045 'conditions': [ |
| 1046 ['linux_use_tcmalloc==1', { | 1046 ['linux_use_tcmalloc==1', { |
| 1047 'dependencies': [ | 1047 'dependencies': [ |
| 1048 '../base/allocator/allocator.gyp:allocator', | 1048 '../base/allocator/allocator.gyp:allocator', |
| 1049 ], | 1049 ], |
| 1050 }], | 1050 }], |
| 1051 ], | 1051 ], |
| (...skipping 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2314 'browser/search_engines/template_url_scraper_unittest.cc', | 2314 'browser/search_engines/template_url_scraper_unittest.cc', |
| 2315 'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc', | 2315 'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc', |
| 2316 'browser/ui/views/extensions/browser_action_drag_data_unittest.cc', | 2316 'browser/ui/views/extensions/browser_action_drag_data_unittest.cc', |
| 2317 'browser/ui/views/first_run_search_engine_view_unittest.cc', | 2317 'browser/ui/views/first_run_search_engine_view_unittest.cc', |
| 2318 'browser/ui/views/generic_info_view_unittest.cc', | 2318 'browser/ui/views/generic_info_view_unittest.cc', |
| 2319 'test/data/resource.rc', | 2319 'test/data/resource.rc', |
| 2320 ], | 2320 ], |
| 2321 }], | 2321 }], |
| 2322 ['toolkit_views==1', { | 2322 ['toolkit_views==1', { |
| 2323 'dependencies': [ | 2323 'dependencies': [ |
| 2324 '../views/views.gyp:views', | 2324 '../ui/views/views.gyp:views', |
| 2325 ], | 2325 ], |
| 2326 'sources!': [ | 2326 'sources!': [ |
| 2327 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc', | 2327 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc', |
| 2328 ], | 2328 ], |
| 2329 }, { # else: toolkit_views == 0 | 2329 }, { # else: toolkit_views == 0 |
| 2330 'sources/': [ | 2330 'sources/': [ |
| 2331 ['exclude', '^browser/ui/views/'], | 2331 ['exclude', '^browser/ui/views/'], |
| 2332 ['exclude', '^../views/'], | 2332 ['exclude', '^../views/'], |
| 2333 ['exclude', '^../ui/views/'], | 2333 ['exclude', '^../ui/views/'], |
| 2334 ['exclude', '^browser/extensions/key_identifier_conversion_views_uni
ttest.cc'], | 2334 ['exclude', '^browser/extensions/key_identifier_conversion_views_uni
ttest.cc'], |
| (...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2951 'conditions': [ | 2951 'conditions': [ |
| 2952 ['linux_use_tcmalloc==1', { | 2952 ['linux_use_tcmalloc==1', { |
| 2953 'dependencies': [ | 2953 'dependencies': [ |
| 2954 '../base/allocator/allocator.gyp:allocator', | 2954 '../base/allocator/allocator.gyp:allocator', |
| 2955 ], | 2955 ], |
| 2956 }], | 2956 }], |
| 2957 ], | 2957 ], |
| 2958 }], | 2958 }], |
| 2959 ['toolkit_views==1', { | 2959 ['toolkit_views==1', { |
| 2960 'dependencies': [ | 2960 'dependencies': [ |
| 2961 '../views/views.gyp:views', | 2961 '../ui/views/views.gyp:views', |
| 2962 ], | 2962 ], |
| 2963 'sources!': [ | 2963 'sources!': [ |
| 2964 # TODO(estade): port to linux/views. | 2964 # TODO(estade): port to linux/views. |
| 2965 'browser/ui/webui/constrained_html_ui_browsertest.cc', | 2965 'browser/ui/webui/constrained_html_ui_browsertest.cc', |
| 2966 ], | 2966 ], |
| 2967 }, { # else: toolkit_views == 0 | 2967 }, { # else: toolkit_views == 0 |
| 2968 'sources!': [ | 2968 'sources!': [ |
| 2969 'browser/extensions/browser_action_test_util_views.cc', | 2969 'browser/extensions/browser_action_test_util_views.cc', |
| 2970 'browser/tab_first_render_watcher_browsertest.cc', | 2970 'browser/tab_first_render_watcher_browsertest.cc', |
| 2971 'browser/ui/panels/panel_browser_view_browsertest.cc', | 2971 'browser/ui/panels/panel_browser_view_browsertest.cc', |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3204 'conditions': [ | 3204 'conditions': [ |
| 3205 ['linux_use_tcmalloc==1', { | 3205 ['linux_use_tcmalloc==1', { |
| 3206 'dependencies': [ | 3206 'dependencies': [ |
| 3207 '../base/allocator/allocator.gyp:allocator', | 3207 '../base/allocator/allocator.gyp:allocator', |
| 3208 ], | 3208 ], |
| 3209 }], | 3209 }], |
| 3210 ], | 3210 ], |
| 3211 }], | 3211 }], |
| 3212 ['toolkit_views==1', { | 3212 ['toolkit_views==1', { |
| 3213 'dependencies': [ | 3213 'dependencies': [ |
| 3214 '../views/views.gyp:views', | 3214 '../ui/views/views.gyp:views', |
| 3215 ], | 3215 ], |
| 3216 }], | 3216 }], |
| 3217 ], | 3217 ], |
| 3218 }, | 3218 }, |
| 3219 { | 3219 { |
| 3220 'target_name': 'sync_unit_tests', | 3220 'target_name': 'sync_unit_tests', |
| 3221 'type': 'executable', | 3221 'type': 'executable', |
| 3222 'sources': [ | 3222 'sources': [ |
| 3223 '<(protoc_out_dir)/chrome/browser/sync/protocol/test.pb.cc', | 3223 '<(protoc_out_dir)/chrome/browser/sync/protocol/test.pb.cc', |
| 3224 'app/breakpad_mac_stubs.mm', | 3224 'app/breakpad_mac_stubs.mm', |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3541 }, | 3541 }, |
| 3542 }, { # else: OS != "win" | 3542 }, { # else: OS != "win" |
| 3543 'sources!': [ | 3543 'sources!': [ |
| 3544 'app/chrome_dll.rc', | 3544 'app/chrome_dll.rc', |
| 3545 'app/chrome_version.rc.version', | 3545 'app/chrome_version.rc.version', |
| 3546 'test/data/resource.rc', | 3546 'test/data/resource.rc', |
| 3547 ], | 3547 ], |
| 3548 }], | 3548 }], |
| 3549 ['toolkit_views==1', { | 3549 ['toolkit_views==1', { |
| 3550 'dependencies': [ | 3550 'dependencies': [ |
| 3551 '../views/views.gyp:views', | 3551 '../ui/views/views.gyp:views', |
| 3552 ], | 3552 ], |
| 3553 }], | 3553 }], |
| 3554 ], | 3554 ], |
| 3555 }, | 3555 }, |
| 3556 { | 3556 { |
| 3557 'target_name': 'sync_performance_tests', | 3557 'target_name': 'sync_performance_tests', |
| 3558 'type': 'executable', | 3558 'type': 'executable', |
| 3559 'dependencies': [ | 3559 'dependencies': [ |
| 3560 'browser/sync/protocol/sync_proto.gyp:sync_proto', | 3560 'browser/sync/protocol/sync_proto.gyp:sync_proto', |
| 3561 'chrome', | 3561 'chrome', |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3670 }, | 3670 }, |
| 3671 }, { # else: OS != "win" | 3671 }, { # else: OS != "win" |
| 3672 'sources!': [ | 3672 'sources!': [ |
| 3673 'app/chrome_dll.rc', | 3673 'app/chrome_dll.rc', |
| 3674 'app/chrome_version.rc.version', | 3674 'app/chrome_version.rc.version', |
| 3675 'test/data/resource.rc', | 3675 'test/data/resource.rc', |
| 3676 ], | 3676 ], |
| 3677 }], | 3677 }], |
| 3678 ['toolkit_views==1', { | 3678 ['toolkit_views==1', { |
| 3679 'dependencies': [ | 3679 'dependencies': [ |
| 3680 '../views/views.gyp:views', | 3680 '../ui/views/views.gyp:views', |
| 3681 ], | 3681 ], |
| 3682 }], | 3682 }], |
| 3683 ], | 3683 ], |
| 3684 }, | 3684 }, |
| 3685 { | 3685 { |
| 3686 # Executable that contains all the tests to be run on the GPU bots. | 3686 # Executable that contains all the tests to be run on the GPU bots. |
| 3687 'target_name': 'gpu_tests', | 3687 'target_name': 'gpu_tests', |
| 3688 'type': 'executable', | 3688 'type': 'executable', |
| 3689 'variables': { | 3689 'variables': { |
| 3690 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/test/gpu', | 3690 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/test/gpu', |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3787 '../build/linux/system.gyp:gtk', | 3787 '../build/linux/system.gyp:gtk', |
| 3788 ], | 3788 ], |
| 3789 }], | 3789 }], |
| 3790 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 3790 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { |
| 3791 'dependencies': [ | 3791 'dependencies': [ |
| 3792 '../build/linux/system.gyp:ssl', | 3792 '../build/linux/system.gyp:ssl', |
| 3793 ], | 3793 ], |
| 3794 }], | 3794 }], |
| 3795 ['toolkit_views==1', { | 3795 ['toolkit_views==1', { |
| 3796 'dependencies': [ | 3796 'dependencies': [ |
| 3797 '../views/views.gyp:views', | 3797 '../ui/views/views.gyp:views', |
| 3798 ], | 3798 ], |
| 3799 }], | 3799 }], |
| 3800 ], | 3800 ], |
| 3801 }, | 3801 }, |
| 3802 { | 3802 { |
| 3803 'target_name': 'plugin_tests', | 3803 'target_name': 'plugin_tests', |
| 3804 'type': 'executable', | 3804 'type': 'executable', |
| 3805 'dependencies': [ | 3805 'dependencies': [ |
| 3806 'chrome', | 3806 'chrome', |
| 3807 'chrome_resources.gyp:chrome_resources', | 3807 'chrome_resources.gyp:chrome_resources', |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3921 'conditions': [ | 3921 'conditions': [ |
| 3922 ['win_use_allocator_shim==1', { | 3922 ['win_use_allocator_shim==1', { |
| 3923 'dependencies': [ | 3923 'dependencies': [ |
| 3924 '<(allocator_target)', | 3924 '<(allocator_target)', |
| 3925 ], | 3925 ], |
| 3926 }], | 3926 }], |
| 3927 ], | 3927 ], |
| 3928 }], | 3928 }], |
| 3929 ['toolkit_views==1', { | 3929 ['toolkit_views==1', { |
| 3930 'dependencies': [ | 3930 'dependencies': [ |
| 3931 '../views/views.gyp:views', | 3931 '../ui/views/views.gyp:views', |
| 3932 ], | 3932 ], |
| 3933 }], | 3933 }], |
| 3934 ], | 3934 ], |
| 3935 }, | 3935 }, |
| 3936 ], | 3936 ], |
| 3937 },], # OS!="mac" | 3937 },], # OS!="mac" |
| 3938 ['OS=="win"', { | 3938 ['OS=="win"', { |
| 3939 'targets': [ | 3939 'targets': [ |
| 3940 { | 3940 { |
| 3941 'target_name': 'generate_profile', | 3941 'target_name': 'generate_profile', |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4293 # Use outputs of this action as inputs for the main target build. | 4293 # Use outputs of this action as inputs for the main target build. |
| 4294 # Seems as a misnomer but makes this happy on Linux (scons). | 4294 # Seems as a misnomer but makes this happy on Linux (scons). |
| 4295 'process_outputs_as_sources': 1, | 4295 'process_outputs_as_sources': 1, |
| 4296 }, | 4296 }, |
| 4297 ], # 'actions' | 4297 ], # 'actions' |
| 4298 }, | 4298 }, |
| 4299 ] | 4299 ] |
| 4300 }], # 'coverage!=0' | 4300 }], # 'coverage!=0' |
| 4301 ], # 'conditions' | 4301 ], # 'conditions' |
| 4302 } | 4302 } |
| OLD | NEW |