From 7ba9f27f2b9cf87ef071f98223dc06c30b4df215 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Tue, 9 Dec 2014 06:46:13 +0000 Subject: [PATCH] Set CHECKOUT_SOURCE_ROOT environment variable for Android test wrapper. This makes it possible to clean up the recipes a lot. BUG= R=phoglund@webrtc.org Review URL: https://webrtc-codereview.appspot.com/34409004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7837 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/android/test_runner.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/webrtc/build/android/test_runner.py b/webrtc/build/android/test_runner.py index 7d8ea77b1..3767be707 100755 --- a/webrtc/build/android/test_runner.py +++ b/webrtc/build/android/test_runner.py @@ -11,15 +11,17 @@ Runs tests on Android devices. This script exists to avoid WebRTC being broken by changes in the Chrome Android -test execution toolchain. +test execution toolchain. It also conveniently sets the CHECKOUT_SOURCE_ROOT +environment variable. """ import os import sys -SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) -ROOT_DIR = os.path.join(SCRIPT_DIR, os.pardir, os.pardir, os.pardir) -CHROMIUM_BUILD_ANDROID_DIR = os.path.join(ROOT_DIR, 'build', 'android') +SCRIPT_DIR = os.path.dirname(__file__) +SRC_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, os.pardir, os.pardir, + os.pardir)) +CHROMIUM_BUILD_ANDROID_DIR = os.path.join(SRC_DIR, 'build', 'android') sys.path.insert(0, CHROMIUM_BUILD_ANDROID_DIR) @@ -44,6 +46,7 @@ def main(): 'voice_engine_unittests', 'webrtc_perf_tests', ] + os.environ['CHECKOUT_SOURCE_ROOT'] = SRC_DIR return test_runner.main() if __name__ == '__main__':