diff options
| -rwxr-xr-x | build/gyp_chromium | 3 | ||||
| -rw-r--r-- | build/toolchain_vs2013.hash | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium index ddd38e4..c940832 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -454,8 +454,7 @@ if __name__ == '__main__': depot_tools_win_toolchain = \ bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1'))) # TODO(scottmg): temp build fix while switching to 2013. - if False and \ - sys.platform in ('win32', 'cygwin') and depot_tools_win_toolchain: + 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() temp_handle, data_file = tempfile.mkstemp(suffix='.json') diff --git a/build/toolchain_vs2013.hash b/build/toolchain_vs2013.hash index 92375e1..16b7611 100644 --- a/build/toolchain_vs2013.hash +++ b/build/toolchain_vs2013.hash @@ -1,2 +1,2 @@ -417eafbfc7042e41d3e3945054e4e48f209fd953 -c8ed51346a1832abc18bacc6d4e80a9f70875c5c +519c42612ae51dc1b88c4b7e4daad36938318ab3
+9d9a93134b3eabd003b85b4e7dea06c0eae150ed
|