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

Side by Side Diff: content/content_shell.gypi

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 | « content/content_renderer.gypi ('k') | content/content_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) 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 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 167 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
168 }, 168 },
169 }, 169 },
170 'conditions': [ 170 'conditions': [
171 ['OS=="win" and win_use_allocator_shim==1', { 171 ['OS=="win" and win_use_allocator_shim==1', {
172 'dependencies': [ 172 'dependencies': [
173 '../base/allocator/allocator.gyp:allocator', 173 '../base/allocator/allocator.gyp:allocator',
174 ], 174 ],
175 }], 175 }],
176 ['OS=="win"', { 176 ['OS=="win"', {
177 'link_settings': {
178 'libraries': [
179 '-lcomctl32.lib',
180 ],
181 },
177 'resource_include_dirs': [ 182 'resource_include_dirs': [
178 '<(SHARED_INTERMEDIATE_DIR)/webkit', 183 '<(SHARED_INTERMEDIATE_DIR)/webkit',
179 ], 184 ],
180 'dependencies': [ 185 'dependencies': [
181 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', 186 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
182 ], 187 ],
183 'configurations': { 188 'configurations': {
184 'Debug_Base': { 189 'Debug_Base': {
185 'msvs_settings': { 190 'msvs_settings': {
186 'VCLinkerTool': { 191 'VCLinkerTool': {
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 785 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
781 '--destination_dir', '<(dest_dir)', 786 '--destination_dir', '<(dest_dir)',
782 ], 787 ],
783 }, 788 },
784 ], 789 ],
785 }, 790 },
786 ], 791 ],
787 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 792 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
788 ] 793 ]
789 } 794 }
OLDNEW
« no previous file with comments | « content/content_renderer.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698