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

Side by Side Diff: remoting/remoting.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 | « printing/printing.gyp ('k') | sandbox/linux/sandbox_linux.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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'variables': { 9 'variables': {
10 'conditions': [ 10 'conditions': [
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 '../third_party/GTM/GTMDefines.h', 497 '../third_party/GTM/GTMDefines.h',
498 ], 498 ],
499 'include_dirs': [ 499 'include_dirs': [
500 '../third_party/GTM', 500 '../third_party/GTM',
501 '../third_party/GTM/AppKit', 501 '../third_party/GTM/AppKit',
502 '../third_party/GTM/DebugUtils', 502 '../third_party/GTM/DebugUtils',
503 '../third_party/GTM/Foundation', 503 '../third_party/GTM/Foundation',
504 ], 504 ],
505 'link_settings': { 505 'link_settings': {
506 'libraries': [ 506 'libraries': [
507 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
507 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', 508 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
508 'libpam.a', 509 'libpam.a',
509 ], 510 ],
510 }, 511 },
511 }], 512 }],
512 ['OS=="win"', { 513 ['OS=="win"', {
513 'defines': [ 514 'defines': [
514 '_ATL_NO_EXCEPTIONS', 515 '_ATL_NO_EXCEPTIONS',
515 'ISOLATION_AWARE_ENABLED=1', 516 'ISOLATION_AWARE_ENABLED=1',
516 ], 517 ],
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
1115 'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist', 1116 'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
1116 1117
1117 # Localized strings for 'Info.plist' 1118 # Localized strings for 'Info.plist'
1118 '<!@pymod_do_main(remoting_localize --locale_output ' 1119 '<!@pymod_do_main(remoting_localize --locale_output '
1119 '"<(SHARED_INTERMEDIATE_DIR)/remoting/uninstaller_resources/@{js on_suffix}.lproj/InfoPlist.strings" ' 1120 '"<(SHARED_INTERMEDIATE_DIR)/remoting/uninstaller_resources/@{js on_suffix}.lproj/InfoPlist.strings" '
1120 '--print_only <(remoting_locales))', 1121 '--print_only <(remoting_locales))',
1121 ], 1122 ],
1122 'mac_bundle_resources!': [ 1123 'mac_bundle_resources!': [
1123 'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist', 1124 'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
1124 ], 1125 ],
1126 'link_settings': {
1127 'libraries': [
1128 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
1129 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framewor k',
1130 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
1131 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
1132 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
1133 ],
1134 },
1125 }, # end of target 'remoting_host_uninstaller' 1135 }, # end of target 'remoting_host_uninstaller'
1126 1136
1127 # This packages up the files needed for the remoting host installer so 1137 # This packages up the files needed for the remoting host installer so
1128 # they can be sent off to be signed. 1138 # they can be sent off to be signed.
1129 # We don't build an installer here because we don't have signed binaries . 1139 # We don't build an installer here because we don't have signed binaries .
1130 { 1140 {
1131 'target_name': 'remoting_me2me_host_archive', 1141 'target_name': 'remoting_me2me_host_archive',
1132 'type': 'none', 1142 'type': 'none',
1133 'dependencies': [ 1143 'dependencies': [
1134 'remoting_host_prefpane', 1144 'remoting_host_prefpane',
(...skipping 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after
2509 'codec/video_decoder_verbatim.cc', 2519 'codec/video_decoder_verbatim.cc',
2510 'codec/video_decoder_verbatim.h', 2520 'codec/video_decoder_verbatim.h',
2511 'codec/video_decoder_vp8.cc', 2521 'codec/video_decoder_vp8.cc',
2512 'codec/video_decoder_vp8.h', 2522 'codec/video_decoder_vp8.h',
2513 'codec/video_encoder.h', 2523 'codec/video_encoder.h',
2514 'codec/video_encoder_verbatim.cc', 2524 'codec/video_encoder_verbatim.cc',
2515 'codec/video_encoder_verbatim.h', 2525 'codec/video_encoder_verbatim.h',
2516 'codec/video_encoder_vp8.cc', 2526 'codec/video_encoder_vp8.cc',
2517 'codec/video_encoder_vp8.h', 2527 'codec/video_encoder_vp8.h',
2518 ], 2528 ],
2529 'conditions': [
2530 ['OS == "linux"', {
2531 'link_settings': {
2532 'libraries': [
2533 '-ldl',
2534 ],
2535 },
2536 }],
2537 ],
2519 }, # end of target 'remoting_base' 2538 }, # end of target 'remoting_base'
2520 2539
2521 { 2540 {
2522 'target_name': 'remoting_host_logging', 2541 'target_name': 'remoting_host_logging',
2523 'type': 'static_library', 2542 'type': 'static_library',
2524 'variables': { 'enable_wexit_time_destructors': 1, }, 2543 'variables': { 'enable_wexit_time_destructors': 1, },
2525 'dependencies': [ 2544 'dependencies': [
2526 '../base/base.gyp:base', 2545 '../base/base.gyp:base',
2527 ], 2546 ],
2528 'sources': [ 2547 'sources': [
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
2955 '../base/allocator/allocator.gyp:allocator', 2974 '../base/allocator/allocator.gyp:allocator',
2956 ], 2975 ],
2957 }, 2976 },
2958 ], 2977 ],
2959 ], 2978 ],
2960 }], # end of 'toolkit_uses_gtk == 1' 2979 }], # end of 'toolkit_uses_gtk == 1'
2961 ], # end of 'conditions' 2980 ], # end of 'conditions'
2962 }, # end of target 'remoting_unittests' 2981 }, # end of target 'remoting_unittests'
2963 ], # end of targets 2982 ], # end of targets
2964 } 2983 }
OLDNEW
« no previous file with comments | « printing/printing.gyp ('k') | sandbox/linux/sandbox_linux.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698