commit 172a56344269094838930d79bba615c69c668728
author Oleh Prypin <oprypin@webrtc.org> Wed Apr 04 16:22:01 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Wed Apr 04 14:47:40 2018 +0000
tree 4cd530488119058fbd081057d40b4374e021c7fe
parent 448f4d50dc75531db755ed6829f33be426429f95

Fix path to AppRTC/collider on Windows

Bug: webrtc:7602
No-Try: True
Change-Id: I4d8f254e1316481f35638a1a2882275dfec2b5c1
Reviewed-on: https://webrtc-review.googlesource.com/66860
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22735}

rtc_tools/testing/build_apprtc.py

diff --git a/rtc_tools/testing/build_apprtc.py b/rtc_tools/testing/build_apprtc.py
index c1f65e9..367a260 100755
--- a/rtc_tools/testing/build_apprtc.py
+++ b/rtc_tools/testing/build_apprtc.py
@@ -49,19 +49,17 @@
 
   utils.RemoveDirectory(golang_workspace)
 
-  golang_workspace_src = os.path.join(golang_workspace, 'src')
-
   collider_dir = os.path.join(apprtc_dir, 'src', 'collider')
-  shutil.copytree(collider_dir, golang_workspace_src)
+  shutil.copytree(collider_dir, os.path.join(golang_workspace, 'src'))
 
-  golang_binary = 'go%s' % ('.exe' if utils.GetPlatform() == 'win' else '')
-  golang_path = os.path.join(go_root_dir, 'bin', golang_binary)
-
+  golang_path = os.path.join(go_root_dir, 'bin',
+                             'go' + utils.GetExecutableExtension())
   golang_env = os.environ.copy()
   golang_env['GOROOT'] = go_root_dir
   golang_env['GOPATH'] = golang_workspace
-  collider_exec = os.path.join(golang_workspace, 'collidermain')
-  subprocess.check_call([golang_path, 'build', '-o', collider_exec,
+  collider_out = os.path.join(golang_workspace,
+                              'collidermain' + utils.GetExecutableExtension())
+  subprocess.check_call([golang_path, 'build', '-o', collider_out,
                          'collidermain'], env=golang_env)