| OLD | NEW |
| 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2010 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 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 405 | 405 |
| 406 'app/chrome_dll.rc', | 406 'app/chrome_dll.rc', |
| 407 'test/data/resource.rc', | 407 'test/data/resource.rc', |
| 408 | 408 |
| 409 # TODO: It would be nice to have these pulled in | 409 # TODO: It would be nice to have these pulled in |
| 410 # automatically from direct_dependent_settings in | 410 # automatically from direct_dependent_settings in |
| 411 # their various targets (net.gyp:net_resources, etc.), | 411 # their various targets (net.gyp:net_resources, etc.), |
| 412 # but that causes errors in other targets when | 412 # but that causes errors in other targets when |
| 413 # resulting .res files get referenced multiple times. | 413 # resulting .res files get referenced multiple times. |
| 414 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 414 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', |
| 415 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', |
| 415 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 416 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', |
| 416 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 417 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
| 417 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 418 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
| 418 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 419 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
| 419 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
', | 420 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
', |
| 420 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 421 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', |
| 421 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 422 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
| 422 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 423 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
| 423 | 424 |
| 424 'browser/accessibility/accessibility_win_browsertest.cc', | 425 'browser/accessibility/accessibility_win_browsertest.cc', |
| (...skipping 1427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1852 'include_dirs': [ | 1853 'include_dirs': [ |
| 1853 '<(DEPTH)/third_party/wtl/include', | 1854 '<(DEPTH)/third_party/wtl/include', |
| 1854 ], | 1855 ], |
| 1855 'sources': [ | 1856 'sources': [ |
| 1856 # TODO: It would be nice to have these pulled in | 1857 # TODO: It would be nice to have these pulled in |
| 1857 # automatically from direct_dependent_settings in | 1858 # automatically from direct_dependent_settings in |
| 1858 # their various targets (net.gyp:net_resources, etc.), | 1859 # their various targets (net.gyp:net_resources, etc.), |
| 1859 # but that causes errors in other targets when | 1860 # but that causes errors in other targets when |
| 1860 # resulting .res files get referenced multiple times. | 1861 # resulting .res files get referenced multiple times. |
| 1861 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 1862 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', |
| 1863 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', |
| 1862 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 1864 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', |
| 1863 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 1865 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
| 1864 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 1866 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
| 1865 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 1867 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
| 1866 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
', | 1868 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
', |
| 1867 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 1869 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', |
| 1868 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 1870 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
| 1869 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 1871 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
| 1870 ], | 1872 ], |
| 1871 'link_settings': { | 1873 'link_settings': { |
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2185 }], | 2187 }], |
| 2186 ['OS!="linux" or toolkit_views==1', { | 2188 ['OS!="linux" or toolkit_views==1', { |
| 2187 'sources!': [ | 2189 'sources!': [ |
| 2188 'browser/extensions/browser_action_test_util_gtk.cc', | 2190 'browser/extensions/browser_action_test_util_gtk.cc', |
| 2189 'browser/gtk/view_id_util_browsertest.cc', | 2191 'browser/gtk/view_id_util_browsertest.cc', |
| 2190 ], | 2192 ], |
| 2191 }], | 2193 }], |
| 2192 ['OS=="win"', { | 2194 ['OS=="win"', { |
| 2193 'sources': [ | 2195 'sources': [ |
| 2194 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 2196 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', |
| 2197 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', |
| 2195 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 2198 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', |
| 2196 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 2199 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
| 2197 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
', | 2200 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
', |
| 2198 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 2201 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', |
| 2199 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 2202 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
| 2200 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 2203 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
| 2201 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 2204 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
| 2202 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 2205 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
| 2203 ], | 2206 ], |
| 2204 'include_dirs': [ | 2207 'include_dirs': [ |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2333 ], | 2336 ], |
| 2334 'conditions': [ | 2337 'conditions': [ |
| 2335 ['OS=="win"', { | 2338 ['OS=="win"', { |
| 2336 'dependencies': [ | 2339 'dependencies': [ |
| 2337 'chrome_dll_version', | 2340 'chrome_dll_version', |
| 2338 'installer_util_strings', | 2341 'installer_util_strings', |
| 2339 '../sandbox/sandbox.gyp:sandbox', | 2342 '../sandbox/sandbox.gyp:sandbox', |
| 2340 ], | 2343 ], |
| 2341 'sources': [ | 2344 'sources': [ |
| 2342 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 2345 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', |
| 2346 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', |
| 2343 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 2347 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', |
| 2348 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
| 2344 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
', | 2349 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
', |
| 2345 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | |
| 2346 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 2350 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', |
| 2347 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 2351 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
| 2348 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 2352 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
| 2349 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 2353 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
| 2350 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 2354 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
| 2351 ], | 2355 ], |
| 2352 'configurations': { | 2356 'configurations': { |
| 2353 'Debug_Base': { | 2357 'Debug_Base': { |
| 2354 'msvs_settings': { | 2358 'msvs_settings': { |
| 2355 'VCLinkerTool': { | 2359 'VCLinkerTool': { |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2870 'dependencies+++': [ | 2874 'dependencies+++': [ |
| 2871 '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', | 2875 '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', |
| 2872 ], | 2876 ], |
| 2873 # The sync_integration_tests do not run on mac without this flag. | 2877 # The sync_integration_tests do not run on mac without this flag. |
| 2874 # Search for comments about "xcode_settings" elsewhere in this file. | 2878 # Search for comments about "xcode_settings" elsewhere in this file. |
| 2875 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 2879 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 2876 }], | 2880 }], |
| 2877 ['OS=="win"', { | 2881 ['OS=="win"', { |
| 2878 'sources': [ | 2882 'sources': [ |
| 2879 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 2883 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', |
| 2884 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', |
| 2880 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 2885 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', |
| 2886 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
| 2881 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
', | 2887 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
', |
| 2882 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | |
| 2883 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 2888 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
| 2884 ], | 2889 ], |
| 2885 'include_dirs': [ | 2890 'include_dirs': [ |
| 2886 '<(DEPTH)/third_party/wtl/include', | 2891 '<(DEPTH)/third_party/wtl/include', |
| 2887 ], | 2892 ], |
| 2888 'dependencies': [ | 2893 'dependencies': [ |
| 2889 'chrome_dll_version', | 2894 'chrome_dll_version', |
| 2890 'installer_util_strings', | 2895 'installer_util_strings', |
| 2891 '../sandbox/sandbox.gyp:sandbox', | 2896 '../sandbox/sandbox.gyp:sandbox', |
| 2892 ], | 2897 ], |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2961 '../sandbox/sandbox.gyp:sandbox', | 2966 '../sandbox/sandbox.gyp:sandbox', |
| 2962 ], | 2967 ], |
| 2963 'include_dirs': [ | 2968 'include_dirs': [ |
| 2964 '<(DEPTH)/third_party/wtl/include', | 2969 '<(DEPTH)/third_party/wtl/include', |
| 2965 ], | 2970 ], |
| 2966 'sources': [ | 2971 'sources': [ |
| 2967 'app/chrome_dll.rc', | 2972 'app/chrome_dll.rc', |
| 2968 'app/chrome_dll_resource.h', | 2973 'app/chrome_dll_resource.h', |
| 2969 'app/chrome_dll_version.rc.version', | 2974 'app/chrome_dll_version.rc.version', |
| 2970 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', | 2975 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', |
| 2976 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', |
| 2971 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', | 2977 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', |
| 2972 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', | 2978 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
| 2973 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', | 2979 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
| 2974 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', | 2980 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
| 2975 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
', | 2981 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc
', |
| 2976 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 2982 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', |
| 2977 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', | 2983 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
| 2978 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 2984 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
| 2979 ], | 2985 ], |
| 2980 'conditions': [ | 2986 'conditions': [ |
| (...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3569 ] | 3575 ] |
| 3570 }], # 'coverage!=0' | 3576 }], # 'coverage!=0' |
| 3571 ], # 'conditions' | 3577 ], # 'conditions' |
| 3572 } | 3578 } |
| 3573 | 3579 |
| 3574 # Local Variables: | 3580 # Local Variables: |
| 3575 # tab-width:2 | 3581 # tab-width:2 |
| 3576 # indent-tabs-mode:nil | 3582 # indent-tabs-mode:nil |
| 3577 # End: | 3583 # End: |
| 3578 # vim: set expandtab tabstop=2 shiftwidth=2: | 3584 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |