Commit f6eb26c0 authored by Adam Barth's avatar Adam Barth

Merge pull request #207 from abarth/fix_sky_tool

Update sky_tool now that sky:// isn't a thing
parents 0a427a0a 665f6c33
...@@ -23,6 +23,7 @@ SKY_SERVER_PORT = 9888 ...@@ -23,6 +23,7 @@ SKY_SERVER_PORT = 9888
OBSERVATORY_PORT = 8181 OBSERVATORY_PORT = 8181
APK_NAME = 'SkyDemo.apk' APK_NAME = 'SkyDemo.apk'
ANDROID_PACKAGE = "org.domokit.sky.demo" ANDROID_PACKAGE = "org.domokit.sky.demo"
ANDROID_COMPONENT = '%s/%s.SkyDemoActivity' % (ANDROID_PACKAGE, ANDROID_PACKAGE)
# FIXME: This assumes adb is in $PATH, we could look for ANDROID_HOME, etc? # FIXME: This assumes adb is in $PATH, we could look for ANDROID_HOME, etc?
ADB_PATH = 'adb' ADB_PATH = 'adb'
# FIXME: Do we need to look in $DART_SDK? # FIXME: Do we need to look in $DART_SDK?
...@@ -111,7 +112,7 @@ class Pids(object): ...@@ -111,7 +112,7 @@ class Pids(object):
def _url_for_path(port, root, path): def _url_for_path(port, root, path):
relative_path = os.path.relpath(path, root) relative_path = os.path.relpath(path, root)
return 'sky://localhost:%s/%s' % (port, relative_path) return 'http://localhost:%s/%s' % (port, relative_path)
class StartSky(object): class StartSky(object):
...@@ -193,13 +194,14 @@ class StartSky(object): ...@@ -193,13 +194,14 @@ class StartSky(object):
pids['remote_sky_server_port'] = sky_server_port pids['remote_sky_server_port'] = sky_server_port
# The load happens on the remote device, use the remote port. # The load happens on the remote device, use the remote port.
sky_url = _url_for_path(pids['remote_sky_server_port'], sky_server_root, url = _url_for_path(pids['remote_sky_server_port'], sky_server_root,
main_dart) main_dart)
subprocess.check_call([ADB_PATH, 'shell', subprocess.check_call([ADB_PATH, 'shell',
'am', 'start', 'am', 'start',
'-a', 'android.intent.action.VIEW', '-a', 'android.intent.action.VIEW',
'-d', sky_url]) '-d', url,
ANDROID_COMPONENT])
class StopSky(object): class StopSky(object):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment