Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(456)

Side by Side Diff: chrome/chrome_browser.gypi

Issue 2842021: Fix the allocator dependency to respect win_use_allocator_shim variable.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': '<(library)', 9 'type': '<(library)',
10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA', 10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
(...skipping 2958 matching lines...) Expand 10 before | Expand all | Expand 10 after
2969 ], 2969 ],
2970 'include_dirs': [ 2970 'include_dirs': [
2971 '<(DEPTH)/third_party/wtl/include', 2971 '<(DEPTH)/third_party/wtl/include',
2972 ], 2972 ],
2973 'dependencies': [ 2973 'dependencies': [
2974 '../gears/gears.gyp:gears', 2974 '../gears/gears.gyp:gears',
2975 '../google_update/google_update.gyp:google_update', 2975 '../google_update/google_update.gyp:google_update',
2976 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 2976 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
2977 '../views/views.gyp:views', 2977 '../views/views.gyp:views',
2978 '../rlz/rlz.gyp:rlz_lib', 2978 '../rlz/rlz.gyp:rlz_lib',
2979 '<(allocator_target)',
2980 ], 2979 ],
2981 'export_dependent_settings': [ 2980 'export_dependent_settings': [
2982 '../views/views.gyp:views', 2981 '../views/views.gyp:views',
2983 ], 2982 ],
2984 'sources': [ 2983 'sources': [
2985 'browser/net/ssl_config_service_manager_system.cc', 2984 'browser/net/ssl_config_service_manager_system.cc',
2986 # Using built-in rule in vstudio for midl. 2985 # Using built-in rule in vstudio for midl.
2987 'browser/history/history_indexer.idl', 2986 'browser/history/history_indexer.idl',
2988 ], 2987 ],
2989 'sources!': [ 2988 'sources!': [
2990 'browser/browser_list_stub.cc', 2989 'browser/browser_list_stub.cc',
2991 'browser/history/history_publisher_none.cc', 2990 'browser/history/history_publisher_none.cc',
2992 'browser/importer/nss_decryptor_system_nss.cc', 2991 'browser/importer/nss_decryptor_system_nss.cc',
2993 'browser/importer/nss_decryptor_system_nss.h', 2992 'browser/importer/nss_decryptor_system_nss.h',
2994 'browser/power_save_blocker_stub.cc', 2993 'browser/power_save_blocker_stub.cc',
2995 'browser/views/select_file_dialog.cc', 2994 'browser/views/select_file_dialog.cc',
2996 ], 2995 ],
2996 'conditions': [
2997 ['win_use_allocator_shim==1', {
2998 'dependencies': [
2999 '<(allocator_target)',
3000 ],
3001 }],
3002 ],
2997 }, { # 'OS!="win" 3003 }, { # 'OS!="win"
2998 'sources/': [ 3004 'sources/': [
2999 # Exclude all of hang_monitor. 3005 # Exclude all of hang_monitor.
3000 ['exclude', '^browser/hang_monitor/'], 3006 ['exclude', '^browser/hang_monitor/'],
3001 3007
3002 # Exclude parts of password_manager. 3008 # Exclude parts of password_manager.
3003 ['exclude', '^browser/password_manager/ie7_password\\.cc$'], 3009 ['exclude', '^browser/password_manager/ie7_password\\.cc$'],
3004 3010
3005 # Exclude all of rlz. 3011 # Exclude all of rlz.
3006 ['exclude', '^browser/rlz/'], 3012 ['exclude', '^browser/rlz/'],
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
3494 ], 3500 ],
3495 }, 3501 },
3496 ], 3502 ],
3497 } 3503 }
3498 3504
3499 # Local Variables: 3505 # Local Variables:
3500 # tab-width:2 3506 # tab-width:2
3501 # indent-tabs-mode:nil 3507 # indent-tabs-mode:nil
3502 # End: 3508 # End:
3503 # vim: set expandtab tabstop=2 shiftwidth=2: 3509 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698