summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-23 07:19:55 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-23 07:19:55 +0000
commit907cb98d47f133ee307fefb7cce6ff19f6885e80 (patch)
treeac4fd529e640f8fd55962bdd4e0643c0752d4ecd /build
parente3b328da0175255119d66e83224ceff43086ebec (diff)
downloadchromium_src-907cb98d47f133ee307fefb7cce6ff19f6885e80.zip
chromium_src-907cb98d47f133ee307fefb7cce6ff19f6885e80.tar.gz
chromium_src-907cb98d47f133ee307fefb7cce6ff19f6885e80.tar.bz2
Revert 252837 "trial run of vs2013 with iterator debugging off t..."
> trial run of vs2013 with iterator debugging off to see if browser_tests are timing-related > > BUG= > > Review URL: https://codereview.chromium.org/165693005 TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/176203003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi2
-rwxr-xr-xbuild/gyp_chromium2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi
index bb18d04..4d68880 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2054,7 +2054,7 @@
# instead of O(N*logN). This is particularly slow under memory
# tools like ThreadSanitizer so we want it to be disablable.
# See http://msdn.microsoft.com/en-us/library/aa985982(v=VS.80).aspx
- 'win_debug_disable_iterator_debugging%': '1',
+ 'win_debug_disable_iterator_debugging%': '0',
# An application manifest fragment to declare compatibility settings for
# 'executable' targets. Ignored in other target type.
diff --git a/build/gyp_chromium b/build/gyp_chromium
index 626fb27..a158f39 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -458,7 +458,7 @@ if __name__ == '__main__':
vs2013_runtime_dll_dirs = None
# TODO(scottmg): Temporarily default to off, see http://crbug.com/345993.
depot_tools_win_toolchain = \
- bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1')))
+ bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '0')))
if sys.platform in ('win32', 'cygwin') and depot_tools_win_toolchain:
import find_depot_tools
depot_tools_path = find_depot_tools.add_depot_tools_to_path()