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

Side by Side Diff: trunk/src/build/common.gypi

Issue 23233003: Revert 218286 "Set chrome_multiple_dll=1 by default on Windows i..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 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 | « no previous file | trunk/src/chrome/chrome_android.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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 1414 matching lines...) Expand 10 before | Expand all | Expand 10 after
1425 ['OS=="win"', { 1425 ['OS=="win"', {
1426 'conditions': [ 1426 'conditions': [
1427 # This is the architecture convention used in WinSDK paths. 1427 # This is the architecture convention used in WinSDK paths.
1428 ['target_arch=="ia32"', { 1428 ['target_arch=="ia32"', {
1429 'winsdk_arch%': 'x86', 1429 'winsdk_arch%': 'x86',
1430 },{ 1430 },{
1431 'winsdk_arch%': '<(target_arch)', 1431 'winsdk_arch%': '<(target_arch)',
1432 }], 1432 }],
1433 ['component=="shared_library"', { 1433 ['component=="shared_library"', {
1434 'win_use_allocator_shim%': 0, 1434 'win_use_allocator_shim%': 0,
1435 },{
1436 # Turn on multiple dll by default on Windows when in static_library.
1437 'chrome_multiple_dll%': 1,
1438 }], 1435 }],
1439 ['component=="shared_library" and "<(GENERATOR)"=="ninja"', { 1436 ['component=="shared_library" and "<(GENERATOR)"=="ninja"', {
1440 # Only enabled by default for ninja because it's buggy in VS. 1437 # Only enabled by default for ninja because it's buggy in VS.
1441 # Not enabled for component=static_library because some targets 1438 # Not enabled for component=static_library because some targets
1442 # are too large and the toolchain fails due to the size of the 1439 # are too large and the toolchain fails due to the size of the
1443 # .obj files. 1440 # .obj files.
1444 'incremental_chrome_dll%': 1, 1441 'incremental_chrome_dll%': 1,
1445 }], 1442 }],
1446 # Don't do incremental linking for large modules on 32-bit. 1443 # Don't do incremental linking for large modules on 32-bit.
1447 ['MSVS_OS_BITS==32', { 1444 ['MSVS_OS_BITS==32', {
(...skipping 3259 matching lines...) Expand 10 before | Expand all | Expand 10 after
4707 # settings in target dicts. SYMROOT is a special case, because many other 4704 # settings in target dicts. SYMROOT is a special case, because many other
4708 # Xcode variables depend on it, including variables such as 4705 # Xcode variables depend on it, including variables such as
4709 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4706 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4710 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4707 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4711 # files to appear (when present) in the UI as actual files and not red 4708 # files to appear (when present) in the UI as actual files and not red
4712 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4709 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4713 # and therefore SYMROOT, needs to be set at the project level. 4710 # and therefore SYMROOT, needs to be set at the project level.
4714 'SYMROOT': '<(DEPTH)/xcodebuild', 4711 'SYMROOT': '<(DEPTH)/xcodebuild',
4715 }, 4712 },
4716 } 4713 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/chrome_android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698