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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 318153002: Remove ftol workaround since we're rolled to Update2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 3351 matching lines...) Expand 10 before | Expand all | Expand 10 after
3362 'sources/': [ 3362 'sources/': [
3363 # Exclude all of rlz. 3363 # Exclude all of rlz.
3364 ['exclude', '^browser/rlz/'], 3364 ['exclude', '^browser/rlz/'],
3365 ], 3365 ],
3366 }], 3366 }],
3367 # Temporary fix to break the browser target into smaller chunks so it 3367 # Temporary fix to break the browser target into smaller chunks so it
3368 # will link with goma builds. 3368 # will link with goma builds.
3369 ['OS=="win" and chromium_win_pch==0', { 3369 ['OS=="win" and chromium_win_pch==0', {
3370 'msvs_shard': 4, 3370 'msvs_shard': 4,
3371 }], 3371 }],
3372 ['OS=="win" and target_arch=="ia32"', {
3373 'sources': [
3374 # TODO(scottmg): This is a workaround for
3375 # http://crbug.com/348525 that affects VS2013 before Update 2.
3376 # This should be removed once Update 2 is released.
3377 '../build/win/ftol3.obj',
3378 ],
3379 }],
3380 ['OS=="win"', { 3372 ['OS=="win"', {
3381 'include_dirs': [ 3373 'include_dirs': [
3382 '<(DEPTH)/third_party/wtl/include', 3374 '<(DEPTH)/third_party/wtl/include',
3383 ], 3375 ],
3384 'dependencies': [ 3376 'dependencies': [
3385 'chrome_process_finder', 3377 'chrome_process_finder',
3386 'installer_util_strings', 3378 'installer_util_strings',
3387 '../chrome/chrome.gyp:chrome_version_header', 3379 '../chrome/chrome.gyp:chrome_version_header',
3388 '../chrome_elf/chrome_elf.gyp:chrome_elf', 3380 '../chrome_elf/chrome_elf.gyp:chrome_elf',
3389 '../chrome_elf/chrome_elf.gyp:chrome_elf_constants', 3381 '../chrome_elf/chrome_elf.gyp:chrome_elf_constants',
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
3785 'package_name': 'org/chromium/chrome/browser', 3777 'package_name': 'org/chromium/chrome/browser',
3786 'template_deps': ['browser/android/tab_load_status.h'], 3778 'template_deps': ['browser/android/tab_load_status.h'],
3787 }, 3779 },
3788 'includes': [ '../build/android/java_cpp_template.gypi' ], 3780 'includes': [ '../build/android/java_cpp_template.gypi' ],
3789 }, 3781 },
3790 ], 3782 ],
3791 }, 3783 },
3792 ], 3784 ],
3793 ], 3785 ],
3794 } 3786 }
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