zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix path to AppRTC/collider on Windows

Browse Source 
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}
This commit is contained in:
Oleh Prypin
2018-04-04 16:22:01 +02:00
committed by Commit Bot
parent 448f4d50dc
commit 172a563442
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rtc_tools/testing/build_apprtc.py
View File

@ -49,19 +49,17 @@ def main(argv):
utils.RemoveDirectory(golang_workspace) utils.RemoveDirectory(golang_workspace)
golang_workspace_src = os.path.join(golang_workspace, 'src')
collider_dir = os.path.join(apprtc_dir, 'src', 'collider') 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 = os.environ.copy()
golang_env['GOROOT'] = go_root_dir golang_env['GOROOT'] = go_root_dir
golang_env['GOPATH'] = golang_workspace golang_env['GOPATH'] = golang_workspace
collider_exec = os.path.join(golang_workspace, 'collidermain') collider_out = os.path.join(golang_workspace,
subprocess.check_call([golang_path, 'build', '-o', collider_exec, 'collidermain' + utils.GetExecutableExtension())
subprocess.check_call([golang_path, 'build', '-o', collider_out,
'collidermain'], env=golang_env) 'collidermain'], env=golang_env)

4
rtc_tools/testing/utils.py
View File

@ -118,3 +118,7 @@ def GetPlatform():
if sys.platform.startswith('darwin'): if sys.platform.startswith('darwin'):
return 'mac' return 'mac'
raise Exception("Can't run on platform %s." % sys.platform) raise Exception("Can't run on platform %s." % sys.platform)
def GetExecutableExtension():
return '.exe' if GetPlatform() == 'win' else ''