From 368b5ffecc78a0a1053eb9c81cc335a269d30760 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Wed, 15 Feb 2017 20:51:26 +0100 Subject: [PATCH] Make iOS API Framework script use the src/ dir as cwd for commands. The recent infra CL https://chromium-review.googlesource.com/c/439266/ seems to have broken our bot. It's better the script doesn't have any assumptions on cwd when executing. BUG=None R=mbonadei@webrtc.org TBR=mbonadei@webrtc.org Review-Url: https://codereview.webrtc.org/2695303002 . Cr-Commit-Position: refs/heads/master@{#16632} --- tools-webrtc/ios/build_ios_libs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools-webrtc/ios/build_ios_libs.py b/tools-webrtc/ios/build_ios_libs.py index a4ace45b7e..fc6e88b65d 100755 --- a/tools-webrtc/ios/build_ios_libs.py +++ b/tools-webrtc/ios/build_ios_libs.py @@ -26,8 +26,8 @@ import sys os.environ['PATH'] = '/usr/libexec' + os.pathsep + os.environ['PATH'] SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) -WEBRTC_BASE_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, '..', '..')) -SDK_OUTPUT_DIR = os.path.join(WEBRTC_BASE_DIR, 'out_ios_libs') +WEBRTC_SRC_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, '..', '..')) +SDK_OUTPUT_DIR = os.path.join(WEBRTC_SRC_DIR, 'out_ios_libs') SDK_LIB_NAME = 'librtc_sdk_objc.a' SDK_FRAMEWORK_NAME = 'WebRTC.framework' @@ -70,7 +70,7 @@ def _ParseArgs(): def _RunCommand(cmd): logging.debug('Running: %r', cmd) - subprocess.check_call(cmd) + subprocess.check_call(cmd, cwd=WEBRTC_SRC_DIR) def _CleanArtifacts(output_dir):