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

Side by Side Diff: build/common.gypi

Issue 1105213002: win 2015: disable allocator shim (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove changes to allocator.gyp Created 5 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
« no previous file with comments | « no previous file | no next file » | 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 1911 matching lines...) Expand 10 before | Expand all | Expand 10 after
1922 ], 1922 ],
1923 }], # OS=="mac" or OS=="ios" 1923 }], # OS=="mac" or OS=="ios"
1924 ['OS=="win"', { 1924 ['OS=="win"', {
1925 'conditions': [ 1925 'conditions': [
1926 # This is the architecture convention used in WinSDK paths. 1926 # This is the architecture convention used in WinSDK paths.
1927 ['target_arch=="ia32"', { 1927 ['target_arch=="ia32"', {
1928 'winsdk_arch%': 'x86', 1928 'winsdk_arch%': 'x86',
1929 },{ 1929 },{
1930 'winsdk_arch%': '<(target_arch)', 1930 'winsdk_arch%': '<(target_arch)',
1931 }], 1931 }],
1932 ['component=="shared_library"', { 1932 ['component=="shared_library" or MSVS_VERSION == "2015"', {
1933 # TODO(scottmg): The allocator shimming doesn't work on the 2015 CRT
1934 # and we are hoping to be able to remove it if an additional feature
1935 # lands in the 2015 CRT API. For now, don't shim and revisit once
1936 # VS2015 is RTM: http://crbug.com/481611.
1933 'win_use_allocator_shim%': 0, 1937 'win_use_allocator_shim%': 0,
1934 },{ 1938 }],
1939 ['component=="static_library"', {
1935 # Turn on multiple dll by default on Windows when in static_library. 1940 # Turn on multiple dll by default on Windows when in static_library.
1936 'chrome_multiple_dll%': 1, 1941 'chrome_multiple_dll%': 1,
1937 }], 1942 }],
1938 ['asan==1 or syzyasan==1', { 1943 ['asan==1 or syzyasan==1', {
1939 'win_use_allocator_shim%': 0, 1944 'win_use_allocator_shim%': 0,
1940 }], 1945 }],
1941 ['syzyasan==1', { 1946 ['syzyasan==1', {
1942 'kasko%': 1, 1947 'kasko%': 1,
1943 }], 1948 }],
1944 ['component=="shared_library" and "<(GENERATOR)"=="ninja"', { 1949 ['component=="shared_library" and "<(GENERATOR)"=="ninja"', {
(...skipping 4211 matching lines...) Expand 10 before | Expand all | Expand 10 after
6156 # settings in target dicts. SYMROOT is a special case, because many other 6161 # settings in target dicts. SYMROOT is a special case, because many other
6157 # Xcode variables depend on it, including variables such as 6162 # Xcode variables depend on it, including variables such as
6158 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6163 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6159 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6164 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6160 # files to appear (when present) in the UI as actual files and not red 6165 # files to appear (when present) in the UI as actual files and not red
6161 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6166 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6162 # and therefore SYMROOT, needs to be set at the project level. 6167 # and therefore SYMROOT, needs to be set at the project level.
6163 'SYMROOT': '<(DEPTH)/xcodebuild', 6168 'SYMROOT': '<(DEPTH)/xcodebuild',
6164 }, 6169 },
6165 } 6170 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698