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

Side by Side Diff: chrome/chrome.gyp

Issue 23868020: Fix remaining shared_library link_settings propagation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 2 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
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_browser.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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 ], 523 ],
524 'sources': [ 524 'sources': [
525 'app/app_mode_loader_mac.mm', 525 'app/app_mode_loader_mac.mm',
526 'app/app_mode-Info.plist', 526 'app/app_mode-Info.plist',
527 ], 527 ],
528 'include_dirs': [ 528 'include_dirs': [
529 '..', 529 '..',
530 ], 530 ],
531 'link_settings': { 531 'link_settings': {
532 'libraries': [ 532 'libraries': [
533 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
533 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', 534 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
534 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 535 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
535 ], 536 ],
536 }, 537 },
537 'mac_bundle_resources!': [ 538 'mac_bundle_resources!': [
538 'app/app_mode-Info.plist', 539 'app/app_mode-Info.plist',
539 ], 540 ],
540 'mac_bundle_resources/': [ 541 'mac_bundle_resources/': [
541 ['exclude', '.*'], 542 ['exclude', '.*'],
542 ], 543 ],
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 '../ui/events/events.gyp:events', 691 '../ui/events/events.gyp:events',
691 '../ui/gfx/gfx.gyp:gfx', 692 '../ui/gfx/gfx.gyp:gfx',
692 '../ui/ui.gyp:ui', 693 '../ui/ui.gyp:ui',
693 ], 694 ],
694 'include_dirs': [ 695 'include_dirs': [
695 '<(grit_out_dir)', 696 '<(grit_out_dir)',
696 ], 697 ],
697 'sources': [ 698 'sources': [
698 'tools/mac_helpers/infoplist_strings_util.mm', 699 'tools/mac_helpers/infoplist_strings_util.mm',
699 ], 700 ],
701 'link_settings': {
702 'libraries': [
703 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
704 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
705 ],
706 },
700 }, 707 },
701 ], # targets 708 ], # targets
702 }], # OS=="mac" 709 }], # OS=="mac"
703 ['OS!="mac" and OS!="ios"', { 710 ['OS!="mac" and OS!="ios"', {
704 'targets': [ 711 'targets': [
705 { 712 {
706 'target_name': 'convert_dict', 713 'target_name': 'convert_dict',
707 'type': 'executable', 714 'type': 'executable',
708 'variables': { 'enable_wexit_time_destructors': 1, }, 715 'variables': { 'enable_wexit_time_destructors': 1, },
709 'dependencies': [ 716 'dependencies': [
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 'sources': [ 1190 'sources': [
1184 'service/cloud_print/print_system_cups.cc', 1191 'service/cloud_print/print_system_cups.cc',
1185 ], 1192 ],
1186 }], 1193 }],
1187 ], 1194 ],
1188 }, 1195 },
1189 ], 1196 ],
1190 }], 1197 }],
1191 ], # 'conditions' 1198 ], # 'conditions'
1192 } 1199 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698