Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2012 The Chromium Authors. All rights reserved. | 1 # Copyright 2012 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 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'browser', | 8 'target_name': 'browser', |
| 9 'type': 'none', | |
| 10 'dependencies': [ 'browser_real', ], | |
| 11 'conditions': [ | |
| 12 ['OS != "ios"', { | |
| 13 'defines': [ | |
| 14 '<@(nacl_defines)', | |
|
scottmg
2014/01/06 21:58:27
i don't think this is doing anything here? wouldn'
| |
| 15 ], | |
| 16 'direct_dependent_settings': { | |
| 17 'defines': [ | |
| 18 '<@(nacl_defines)', | |
| 19 ], | |
| 20 }, | |
| 21 }], | |
| 22 ], | |
| 23 }, | |
| 24 { | |
| 25 'target_name': 'browser_real', | |
| 9 'type': 'static_library', | 26 'type': 'static_library', |
| 10 'variables': { 'enable_wexit_time_destructors': 1, }, | 27 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 11 'dependencies': [ | 28 'dependencies': [ |
| 12 # NOTE: New dependencies should generally be added in the OS!="ios" | 29 # NOTE: New dependencies should generally be added in the OS!="ios" |
| 13 # dependencies block below, rather than here. | 30 # dependencies block below, rather than here. |
| 14 'browser/search_engines/prepopulated_engines.gyp:prepopulated_engines', | 31 'browser/search_engines/prepopulated_engines.gyp:prepopulated_engines', |
| 15 'browser_ui', | 32 'browser_ui', |
| 16 'cert_logger_proto', | 33 'cert_logger_proto', |
| 17 'chrome_resources.gyp:chrome_extra_resources', | 34 'chrome_resources.gyp:chrome_extra_resources', |
| 18 'chrome_resources.gyp:chrome_resources', | 35 'chrome_resources.gyp:chrome_resources', |
| (...skipping 2631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2650 '../ui/gl/gl.gyp:gl', | 2667 '../ui/gl/gl.gyp:gl', |
| 2651 '../ui/surface/surface.gyp:surface', | 2668 '../ui/surface/surface.gyp:surface', |
| 2652 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', | 2669 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', |
| 2653 '../v8/tools/gyp/v8.gyp:v8', | 2670 '../v8/tools/gyp/v8.gyp:v8', |
| 2654 '../webkit/common/webkit_common.gyp:webkit_common', | 2671 '../webkit/common/webkit_common.gyp:webkit_common', |
| 2655 '../webkit/storage_browser.gyp:webkit_storage_browser', | 2672 '../webkit/storage_browser.gyp:webkit_storage_browser', |
| 2656 '../webkit/storage_common.gyp:webkit_storage_common', | 2673 '../webkit/storage_common.gyp:webkit_storage_common', |
| 2657 '../webkit/webkit_resources.gyp:webkit_resources', | 2674 '../webkit/webkit_resources.gyp:webkit_resources', |
| 2658 ], | 2675 ], |
| 2659 'defines': [ | 2676 'defines': [ |
| 2660 '<@(nacl_defines)', | 2677 '<@(nacl_defines)', |
|
scottmg
2014/01/06 21:58:27
oh, it's also down here. yeah, remove from above t
| |
| 2661 ], | 2678 ], |
| 2662 'direct_dependent_settings': { | 2679 'direct_dependent_settings': { |
| 2663 'defines': [ | 2680 'defines': [ |
| 2664 '<@(nacl_defines)', | 2681 '<@(nacl_defines)', |
| 2665 ], | 2682 ], |
| 2666 }, | 2683 }, |
| 2667 }, { # OS == "ios" | 2684 }, { # OS == "ios" |
| 2668 'dependencies': [ | 2685 'dependencies': [ |
| 2669 '../net/net.gyp:net', | 2686 '../net/net.gyp:net', |
| 2670 ], | 2687 ], |
| (...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3316 'dependencies': [ | 3333 'dependencies': [ |
| 3317 '../rlz/rlz.gyp:rlz_lib', | 3334 '../rlz/rlz.gyp:rlz_lib', |
| 3318 ], | 3335 ], |
| 3319 }, { # enable_rlz!=1 | 3336 }, { # enable_rlz!=1 |
| 3320 'sources/': [ | 3337 'sources/': [ |
| 3321 # Exclude all of rlz. | 3338 # Exclude all of rlz. |
| 3322 ['exclude', '^browser/rlz/'], | 3339 ['exclude', '^browser/rlz/'], |
| 3323 ], | 3340 ], |
| 3324 }], | 3341 }], |
| 3325 ['OS=="win"', { | 3342 ['OS=="win"', { |
| 3343 'msvs_shard': 4, | |
| 3326 'include_dirs': [ | 3344 'include_dirs': [ |
| 3327 '<(DEPTH)/third_party/wtl/include', | 3345 '<(DEPTH)/third_party/wtl/include', |
| 3328 ], | 3346 ], |
| 3329 'dependencies': [ | 3347 'dependencies': [ |
| 3330 'chrome_process_finder', | 3348 'chrome_process_finder', |
| 3331 'installer_util_strings', | 3349 'installer_util_strings', |
| 3332 '../google_update/google_update.gyp:google_update', | 3350 '../google_update/google_update.gyp:google_update', |
| 3333 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', | 3351 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', |
| 3334 '../third_party/isimpledom/isimpledom.gyp:isimpledom', | 3352 '../third_party/isimpledom/isimpledom.gyp:isimpledom', |
| 3335 '../ui/views/controls/webview/webview.gyp:webview', | 3353 '../ui/views/controls/webview/webview.gyp:webview', |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3636 'package_name': 'org/chromium/chrome/browser/ui/toolbar', | 3654 'package_name': 'org/chromium/chrome/browser/ui/toolbar', |
| 3637 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], | 3655 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], |
| 3638 }, | 3656 }, |
| 3639 'includes': [ '../build/android/java_cpp_template.gypi' ], | 3657 'includes': [ '../build/android/java_cpp_template.gypi' ], |
| 3640 }, | 3658 }, |
| 3641 ], | 3659 ], |
| 3642 }, | 3660 }, |
| 3643 ], | 3661 ], |
| 3644 ], | 3662 ], |
| 3645 } | 3663 } |
| OLD | NEW |