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

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

Issue 297753002: 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',
111 'chrome_version_resources', 112 'chrome_version_resources',
112 '../chrome/chrome_resources.gyp:chrome_unscaled_resources', 113 '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
113 '../crypto/crypto.gyp:crypto', 114 '../crypto/crypto.gyp:crypto',
114 '../net/net.gyp:net_resources', 115 '../net/net.gyp:net_resources',
115 '../ui/views/views.gyp:views', 116 '../ui/views/views.gyp:views',
116 '../webkit/webkit_resources.gyp:webkit_resources', 117 '../webkit/webkit_resources.gyp:webkit_resources',
117 ], 118 ],
118 'sources': [ 119 'sources': [
119 'app/chrome_command_ids.h', 120 'app/chrome_command_ids.h',
120 'app/chrome_dll.rc', 121 'app/chrome_dll.rc',
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 'dependencies': [ 321 'dependencies': [
321 '../components/components.gyp:breakpad_stubs', 322 '../components/components.gyp:breakpad_stubs',
322 ], 323 ],
323 }], # mac_breakpad_compiled_in 324 }], # mac_breakpad_compiled_in
324 ], # conditions 325 ], # conditions
325 }], # OS=="mac" 326 }], # OS=="mac"
326 ], # conditions 327 ], # conditions
327 }, # target chrome_main_dll 328 }, # target chrome_main_dll
328 ], # targets 329 ], # targets
329 }], # OS=="mac" or OS=="win" 330 }], # 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 }],
330 ['chrome_multiple_dll', { 354 ['chrome_multiple_dll', {
331 'targets': [ 355 'targets': [
332 { 356 {
333 'target_name': 'chrome_child_dll', 357 'target_name': 'chrome_child_dll',
334 'type': 'shared_library', 358 'type': 'shared_library',
335 'product_name': 'chrome_child', 359 'product_name': 'chrome_child',
336 'variables': { 360 'variables': {
337 'enable_wexit_time_destructors': 1, 361 'enable_wexit_time_destructors': 1,
338 }, 362 },
339 'dependencies': [ 363 'dependencies': [
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 }, 397 },
374 }], 398 }],
375 ] 399 ]
376 }], 400 }],
377 ], 401 ],
378 }, # target chrome_child_dll 402 }, # target chrome_child_dll
379 ], 403 ],
380 }], 404 }],
381 ], 405 ],
382 } 406 }
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