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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 186333002: Add ftol workaround for VS2013 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | « build/win/ftol3.obj ('k') | chrome/chrome_exe.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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'none', 9 'type': 'none',
10 'dependencies': [ 'browser_real', ], 10 'dependencies': [ 'browser_real', ],
(...skipping 3385 matching lines...) Expand 10 before | Expand all | Expand 10 after
3396 'sources/': [ 3396 'sources/': [
3397 # Exclude all of rlz. 3397 # Exclude all of rlz.
3398 ['exclude', '^browser/rlz/'], 3398 ['exclude', '^browser/rlz/'],
3399 ], 3399 ],
3400 }], 3400 }],
3401 # Temporary fix to break the browser target into smaller chunks so it 3401 # Temporary fix to break the browser target into smaller chunks so it
3402 # will link with goma builds. 3402 # will link with goma builds.
3403 ['OS=="win" and chromium_win_pch==0', { 3403 ['OS=="win" and chromium_win_pch==0', {
3404 'msvs_shard': 4, 3404 'msvs_shard': 4,
3405 }], 3405 }],
3406 ['OS=="win" and target_arch=="ia32"', {
3407 'sources': [
3408 # TODO(scottmg): This is a workaround for
3409 # http://crbug.com/348525 that affects VS2013 before Update 2.
3410 # This should be removed once Update 2 is released.
3411 '../build/win/ftol3.obj',
3412 ],
3413 }],
3406 ['OS=="win"', { 3414 ['OS=="win"', {
3407 'include_dirs': [ 3415 'include_dirs': [
3408 '<(DEPTH)/third_party/wtl/include', 3416 '<(DEPTH)/third_party/wtl/include',
3409 ], 3417 ],
3410 'dependencies': [ 3418 'dependencies': [
3411 'chrome_process_finder', 3419 'chrome_process_finder',
3412 'installer_util_strings', 3420 'installer_util_strings',
3413 '../chrome/chrome.gyp:chrome_version_header', 3421 '../chrome/chrome.gyp:chrome_version_header',
3414 '../chrome_elf/chrome_elf.gyp:chrome_elf', 3422 '../chrome_elf/chrome_elf.gyp:chrome_elf',
3415 '../chrome_elf/chrome_elf.gyp:chrome_elf_constants', 3423 '../chrome_elf/chrome_elf.gyp:chrome_elf_constants',
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
3782 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3790 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3783 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3791 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3784 }, 3792 },
3785 'includes': [ '../build/android/java_cpp_template.gypi' ], 3793 'includes': [ '../build/android/java_cpp_template.gypi' ],
3786 }, 3794 },
3787 ], 3795 ],
3788 }, 3796 },
3789 ], 3797 ],
3790 ], 3798 ],
3791 } 3799 }
OLDNEW
« no previous file with comments | « build/win/ftol3.obj ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698