admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug in gyp_webrtc.py when DEPOT_TOOLS_WIN_TOOLCHAIN=0

Browse Source 
In https://codereview.webrtc.org/1895713002 a bug was introduced
in order to satisfy the PyLint check.

BUG=webrtc:5911
NOTRY=True
R=phoglund@webrtc.org

Review URL: https://codereview.webrtc.org/1992813006 .

Cr-Commit-Position: refs/heads/master@{#12810}
This commit is contained in:
kjellander@webrtc.org 2016-05-19 13:30:09 +02:00
parent bd76607abb
commit 0026dd85de
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/build/gyp_webrtc.py
View File

@ -86,7 +86,7 @@ def main():
os.environ['GYP_GENERATOR_FLAGS'] = (
gyp_generator_flags + ' msvs_error_on_missing_sources=1')
vs2013_runtime_dll_dirs = None, None
vs2013_runtime_dll_dirs = None
if int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1')):
vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
@ -116,6 +116,7 @@ def main():
gyp_rc = gyp.main(args)
if vs2013_runtime_dll_dirs:
# pylint: disable=unpacking-non-sequence
x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
vs_toolchain.CopyVsRuntimeDlls(
os.path.join(checkout_root, gyp_chromium.GetOutputDirectory()),