Commit 6deb3705 authored by hbono@chromium.org's avatar hbono@chromium.org

Disables allocator_shim on Windows memory builders.

This change disables allocator_shim on Windows memory builders because it causes a linker error with the latest ANGLE code as reported by Erik (*1). Allocator_shim is disabled on shared builds and it happens only on memory builders, which use static builds. (All the other Windows debug builders use shared builds.)

(*1) https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/4197e93c6f5814ef/330ea8d9d31141e1?lnk=gst&q=base%2Fallocator+#330ea8d9d31141e1

BUG=none
TEST=build unit_tests.exe on the "Windows Tests (tsan)" bot and the "Chromium Windows Builder (DrMemory)" bot.
Review URL: https://chromiumcodereview.appspot.com/10704178

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146303 0039d316-1c4b-4281-b951-d872f2087c98
parent 357ce76f
......@@ -1184,6 +1184,7 @@
'release_valgrind_build': 1,
'werror': '',
'component': 'static_library',
'win_use_allocator_shim': 0,
'use_system_zlib': 0,
}],
......@@ -1193,6 +1194,8 @@
['build_for_tool=="drmemory"', {
# DrMemory can't handle the debug CRT dll, so build static.
'component': 'static_library',
# Allocator_shim causes a linker error when we use std::locale.
'win_use_allocator_shim': 0,
# These runtime checks force initialization of stack vars which blocks
# DrMemory's uninit detection.
'win_debug_RuntimeChecks': '0',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment