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

Unified 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, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index c5a8facb9e1122e7fce09a5cdfaca06c486d7047..b3d30d1b65ce636d40a77586816db3c872179376 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1929,9 +1929,14 @@
},{
'winsdk_arch%': '<(target_arch)',
}],
- ['component=="shared_library"', {
+ ['component=="shared_library" or MSVS_VERSION == "2015"', {
+ # TODO(scottmg): The allocator shimming doesn't work on the 2015 CRT
+ # and we are hoping to be able to remove it if an additional feature
+ # lands in the 2015 CRT API. For now, don't shim and revisit once
+ # VS2015 is RTM: http://crbug.com/481611.
'win_use_allocator_shim%': 0,
- },{
+ }],
+ ['component=="static_library"', {
# Turn on multiple dll by default on Windows when in static_library.
'chrome_multiple_dll%': 1,
}],
« 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