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

Side by Side Diff: trunk/src/chrome/chrome_dll.gypi

Issue 295093004: Revert 271737 "Revert 271721 "VS2013 Update 2"" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | « trunk/src/build/toolchain_vs2013.hash ('k') | trunk/src/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) 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 'conditions': [ 5 'conditions': [
6 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 # imports only in x86 builds. 101 # imports only in x86 builds.
102 'dependencies': [ 102 'dependencies': [
103 'chrome_user32_delay_imports', 103 'chrome_user32_delay_imports',
104 ], 104 ],
105 },], 105 },],
106 ['OS=="win"', { 106 ['OS=="win"', {
107 'product_name': 'chrome', 107 'product_name': 'chrome',
108 'dependencies': [ 108 'dependencies': [
109 # On Windows, link the dependencies (libraries) that make 109 # On Windows, link the dependencies (libraries) that make
110 # up actual Chromium functionality into this .dll. 110 # up actual Chromium functionality into this .dll.
111 'chrome_dll_pdb_workaround',
112 'chrome_version_resources', 111 'chrome_version_resources',
113 '../chrome/chrome_resources.gyp:chrome_unscaled_resources', 112 '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
114 '../crypto/crypto.gyp:crypto', 113 '../crypto/crypto.gyp:crypto',
115 '../net/net.gyp:net_resources', 114 '../net/net.gyp:net_resources',
116 '../ui/views/views.gyp:views', 115 '../ui/views/views.gyp:views',
117 '../webkit/webkit_resources.gyp:webkit_resources', 116 '../webkit/webkit_resources.gyp:webkit_resources',
118 ], 117 ],
119 'sources': [ 118 'sources': [
120 'app/chrome_command_ids.h', 119 'app/chrome_command_ids.h',
121 'app/chrome_dll.rc', 120 'app/chrome_dll.rc',
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 'dependencies': [ 320 'dependencies': [
322 '../components/components.gyp:breakpad_stubs', 321 '../components/components.gyp:breakpad_stubs',
323 ], 322 ],
324 }], # mac_breakpad_compiled_in 323 }], # mac_breakpad_compiled_in
325 ], # conditions 324 ], # conditions
326 }], # OS=="mac" 325 }], # OS=="mac"
327 ], # conditions 326 ], # conditions
328 }, # target chrome_main_dll 327 }, # target chrome_main_dll
329 ], # targets 328 ], # targets
330 }], # OS=="mac" or OS=="win" 329 }], # OS=="mac" or OS=="win"
331 ['OS=="win"', {
332 'targets': [
333 {
334 # This target is only depended upon on Windows.
335 'target_name': 'chrome_dll_pdb_workaround',
336 'type': 'static_library',
337 'sources': [ 'empty_pdb_workaround.cc' ],
338 'conditions': [
339 ['fastbuild==0 or win_z7!=0', {
340 'msvs_settings': {
341 'VCCLCompilerTool': {
342 # This *in the compile phase* must match the pdb name that's
343 # output by the final link. See empty_pdb_workaround.cc for
344 # more details.
345 'DebugInformationFormat': '3',
346 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/chrome.dll.pdb',
347 },
348 },
349 }],
350 ],
351 },
352 ],
353 }],
354 ['chrome_multiple_dll', { 330 ['chrome_multiple_dll', {
355 'targets': [ 331 'targets': [
356 { 332 {
357 'target_name': 'chrome_child_dll', 333 'target_name': 'chrome_child_dll',
358 'type': 'shared_library', 334 'type': 'shared_library',
359 'product_name': 'chrome_child', 335 'product_name': 'chrome_child',
360 'variables': { 336 'variables': {
361 'enable_wexit_time_destructors': 1, 337 'enable_wexit_time_destructors': 1,
362 }, 338 },
363 'dependencies': [ 339 'dependencies': [
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 }, 373 },
398 }], 374 }],
399 ] 375 ]
400 }], 376 }],
401 ], 377 ],
402 }, # target chrome_child_dll 378 }, # target chrome_child_dll
403 ], 379 ],
404 }], 380 }],
405 ], 381 ],
406 } 382 }
OLDNEW
« no previous file with comments | « trunk/src/build/toolchain_vs2013.hash ('k') | trunk/src/chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698