| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 # Define the common dependencies that contain all the actual | 8 # Define the common dependencies that contain all the actual |
| 9 # Chromium functionality. This list gets pulled in below by | 9 # Chromium functionality. This list gets pulled in below by |
| 10 # the link of the actual chrome (or chromium) executable on | 10 # the link of the actual chrome (or chromium) executable on |
| (...skipping 2109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2120 'installer/installer.gyp:installer_util_strings', | 2120 'installer/installer.gyp:installer_util_strings', |
| 2121 '../breakpad/breakpad.gyp:breakpad_handler', | 2121 '../breakpad/breakpad.gyp:breakpad_handler', |
| 2122 '../breakpad/breakpad.gyp:breakpad_sender', | 2122 '../breakpad/breakpad.gyp:breakpad_sender', |
| 2123 '../sandbox/sandbox.gyp:sandbox', | 2123 '../sandbox/sandbox.gyp:sandbox', |
| 2124 '../views/views.gyp:views', | 2124 '../views/views.gyp:views', |
| 2125 'worker', | 2125 'worker', |
| 2126 ], | 2126 ], |
| 2127 'msvs_settings': { | 2127 'msvs_settings': { |
| 2128 'VCLinkerTool': { | 2128 'VCLinkerTool': { |
| 2129 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', | 2129 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', |
| 2130 # Set /SUBSYSTEM:WINDOWS for chrome.exe itself. |
| 2131 'SubSystem': '2', |
| 2130 }, | 2132 }, |
| 2131 }, | 2133 }, |
| 2132 },{ # 'OS!="win" | 2134 },{ # 'OS!="win" |
| 2133 'dependencies': [ | 2135 'dependencies': [ |
| 2134 # On Linux and Mac, link the dependencies (libraries) | 2136 # On Linux and Mac, link the dependencies (libraries) |
| 2135 # that make up actual Chromium functionality directly | 2137 # that make up actual Chromium functionality directly |
| 2136 # into the executable. | 2138 # into the executable. |
| 2137 '<@(chromium_dependencies)', | 2139 '<@(chromium_dependencies)', |
| 2138 ], | 2140 ], |
| 2139 'sources': [ | 2141 'sources': [ |
| (...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2976 'third_party/wtl/include', | 2978 'third_party/wtl/include', |
| 2977 ], | 2979 ], |
| 2978 'sources!': [ | 2980 'sources!': [ |
| 2979 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', | 2981 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', |
| 2980 'common/file_descriptor_set_unittest.cc', | 2982 'common/file_descriptor_set_unittest.cc', |
| 2981 'common/net/url_util_unittest.cc', | 2983 'common/net/url_util_unittest.cc', |
| 2982 ], | 2984 ], |
| 2983 'dependencies': [ | 2985 'dependencies': [ |
| 2984 '../views/views.gyp:views', | 2986 '../views/views.gyp:views', |
| 2985 ], | 2987 ], |
| 2988 'configurations': { |
| 2989 'Debug': { |
| 2990 'msvs_settings': { |
| 2991 'VCLinkerTool': { |
| 2992 'LinkIncremental': '1', # /INCREMENTAL:NO |
| 2993 }, |
| 2994 }, |
| 2995 }, |
| 2996 }, |
| 2986 }, { # else: OS != "win" | 2997 }, { # else: OS != "win" |
| 2987 'sources!': [ | 2998 'sources!': [ |
| 2988 'browser/bookmarks/bookmark_codec_unittest.cc', | 2999 'browser/bookmarks/bookmark_codec_unittest.cc', |
| 2989 'browser/bookmarks/bookmark_drag_data_unittest.cc', | 3000 'browser/bookmarks/bookmark_drag_data_unittest.cc', |
| 2990 'browser/bookmarks/bookmark_folder_tree_model_unittest.cc', | 3001 'browser/bookmarks/bookmark_folder_tree_model_unittest.cc', |
| 2991 'browser/bookmarks/bookmark_table_model_unittest.cc', | 3002 'browser/bookmarks/bookmark_table_model_unittest.cc', |
| 2992 'browser/browser_commands_unittest.cc', | 3003 'browser/browser_commands_unittest.cc', |
| 2993 'browser/browser_unittest.cc', | 3004 'browser/browser_unittest.cc', |
| 2994 'browser/debugger/devtools_sanity_unittest.cc', | 3005 'browser/debugger/devtools_sanity_unittest.cc', |
| 2995 'browser/extensions/test_extension_loader.cc', | 3006 'browser/extensions/test_extension_loader.cc', |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3230 # TODO(port): | 3241 # TODO(port): |
| 3231 'browser/visitedlink_perftest.cc', | 3242 'browser/visitedlink_perftest.cc', |
| 3232 ], | 3243 ], |
| 3233 }], | 3244 }], |
| 3234 ['OS=="win" or (OS=="linux" and toolkit_views==1)', { | 3245 ['OS=="win" or (OS=="linux" and toolkit_views==1)', { |
| 3235 'dependencies': [ | 3246 'dependencies': [ |
| 3236 '../views/views.gyp:views', | 3247 '../views/views.gyp:views', |
| 3237 ], | 3248 ], |
| 3238 }], | 3249 }], |
| 3239 ], | 3250 ], |
| 3251 'configurations': { |
| 3252 'Debug': { |
| 3253 'msvs_settings': { |
| 3254 'VCLinkerTool': { |
| 3255 'LinkIncremental': '1', # /INCREMENTAL:NO |
| 3256 }, |
| 3257 }, |
| 3258 }, |
| 3259 }, |
| 3240 }, | 3260 }, |
| 3241 ], | 3261 ], |
| 3242 }], # OS!="mac" | 3262 }], # OS!="mac" |
| 3243 ['OS=="win"', | 3263 ['OS=="win"', |
| 3244 { 'targets': [ | 3264 { 'targets': [ |
| 3245 { | 3265 { |
| 3246 'target_name': 'chrome_dll', | 3266 'target_name': 'chrome_dll', |
| 3247 'type': 'shared_library', | 3267 'type': 'shared_library', |
| 3248 'product_name': 'chrome', | 3268 'product_name': 'chrome', |
| 3249 'include_dirs': [ | 3269 'include_dirs': [ |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3326 '../webkit/glue/resources/zoom_in.cur', | 3346 '../webkit/glue/resources/zoom_in.cur', |
| 3327 '../webkit/glue/resources/zoom_out.cur', | 3347 '../webkit/glue/resources/zoom_out.cur', |
| 3328 # TODO(sgk): left-over from pre-gyp build, figure out | 3348 # TODO(sgk): left-over from pre-gyp build, figure out |
| 3329 # if we still need them and/or how to update to gyp. | 3349 # if we still need them and/or how to update to gyp. |
| 3330 #'app/check_dependents.bat', | 3350 #'app/check_dependents.bat', |
| 3331 #'app/chrome.dll.deps', | 3351 #'app/chrome.dll.deps', |
| 3332 ], | 3352 ], |
| 3333 'msvs_settings': { | 3353 'msvs_settings': { |
| 3334 'VCLinkerTool': { | 3354 'VCLinkerTool': { |
| 3335 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib', | 3355 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib', |
| 3356 # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency). |
| 3357 'SubSystem': '2', |
| 3358 }, |
| 3359 }, |
| 3360 'configurations': { |
| 3361 'Debug': { |
| 3362 'msvs_settings': { |
| 3363 'VCLinkerTool': { |
| 3364 'LinkIncremental': '1', # /INCREMENTAL:NO |
| 3365 }, |
| 3366 }, |
| 3336 }, | 3367 }, |
| 3337 }, | 3368 }, |
| 3338 }, | 3369 }, |
| 3339 { | 3370 { |
| 3340 'target_name': 'interactive_ui_tests', | 3371 'target_name': 'interactive_ui_tests', |
| 3341 'type': 'executable', | 3372 'type': 'executable', |
| 3342 'dependencies': [ | 3373 'dependencies': [ |
| 3343 'chrome_resources', | 3374 'chrome_resources', |
| 3344 'chrome_strings', | 3375 'chrome_strings', |
| 3345 'test_support_common', | 3376 'test_support_common', |
| (...skipping 22 matching lines...) Expand all Loading... |
| 3368 'test/interactive_ui/npapi_interactive_test.cc', | 3399 'test/interactive_ui/npapi_interactive_test.cc', |
| 3369 'test/interactive_ui/view_event_test_base.cc', | 3400 'test/interactive_ui/view_event_test_base.cc', |
| 3370 'test/interactive_ui/view_event_test_base.h', | 3401 'test/interactive_ui/view_event_test_base.h', |
| 3371 'tools/build/win/precompiled_wtl.h', | 3402 'tools/build/win/precompiled_wtl.h', |
| 3372 'tools/build/win/precompiled_wtl.cc', | 3403 'tools/build/win/precompiled_wtl.cc', |
| 3373 ], | 3404 ], |
| 3374 'configurations': { | 3405 'configurations': { |
| 3375 'Debug': { | 3406 'Debug': { |
| 3376 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h', | 3407 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h', |
| 3377 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc', | 3408 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc', |
| 3409 'msvs_settings': { |
| 3410 'VCLinkerTool': { |
| 3411 'LinkIncremental': '1', # /INCREMENTAL:NO |
| 3412 }, |
| 3413 }, |
| 3378 }, | 3414 }, |
| 3379 }, | 3415 }, |
| 3380 }, | 3416 }, |
| 3381 { | 3417 { |
| 3382 'target_name': 'plugin_tests', | 3418 'target_name': 'plugin_tests', |
| 3383 'type': 'executable', | 3419 'type': 'executable', |
| 3384 'dependencies': [ | 3420 'dependencies': [ |
| 3385 'chrome_resources', | 3421 'chrome_resources', |
| 3386 'chrome_strings', | 3422 'chrome_strings', |
| 3387 'test_support_common', | 3423 'test_support_common', |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3497 # Use outputs of this action as inputs for the main target build. | 3533 # Use outputs of this action as inputs for the main target build. |
| 3498 # Seems as a misnomer but makes this happy on Linux (scons). | 3534 # Seems as a misnomer but makes this happy on Linux (scons). |
| 3499 'process_outputs_as_sources': 1, | 3535 'process_outputs_as_sources': 1, |
| 3500 }, | 3536 }, |
| 3501 ], # 'actions' | 3537 ], # 'actions' |
| 3502 }, | 3538 }, |
| 3503 ] | 3539 ] |
| 3504 }], | 3540 }], |
| 3505 ], # 'conditions' | 3541 ], # 'conditions' |
| 3506 } | 3542 } |
| OLD | NEW |