From aabc059e5459e1671e4e3203a2b83a888187382c Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Tue, 30 Jun 2015 15:35:30 -0700 Subject: [PATCH] Forward the Observatory port in sky_tool Fixes #275 R=eseidel@chromium.org, eseidel@google.com Review URL: https://codereview.chromium.org/1216283003. --- sdk/lib/sky_tool | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/lib/sky_tool b/sdk/lib/sky_tool index dbaadac33b8..3ad920a802a 100755 --- a/sdk/lib/sky_tool +++ b/sdk/lib/sky_tool @@ -20,6 +20,7 @@ LIB_DIR = os.path.realpath(os.path.dirname(os.path.abspath(__file__))) SKY_PACKAGE_ROOT = os.path.realpath(os.path.dirname(LIB_DIR)) SKY_SERVER_PORT = 9888 +OBSERVATORY_PORT = 8181 APK_NAME = 'SkyDemo.apk' ANDROID_PACKAGE = "org.domokit.sky.demo" # FIXME: This assumes adb is in $PATH, we could look for ANDROID_HOME, etc? @@ -169,6 +170,12 @@ class StartSky(object): subprocess.check_call([ADB_PATH, 'install', '-r', apk_path]) + # Set up port forwarding for observatory + observatory_port_string = 'tcp:%s' % OBSERVATORY_PORT + subprocess.check_call([ + ADB_PATH, 'forward', observatory_port_string, observatory_port_string + ]) + sky_server_port = SKY_SERVER_PORT pids['sky_server_port'] = sky_server_port if _port_in_use(sky_server_port):