Update sky_tool now that sky:// isn't a thing

Instead, just use a normal http URL.
This commit is contained in:
Adam Barth 2015-07-21 19:53:25 -07:00
parent 9ee93ebad8
commit 665f6c33a4

View file

@ -23,6 +23,7 @@ SKY_SERVER_PORT = 9888
OBSERVATORY_PORT = 8181
APK_NAME = 'SkyDemo.apk'
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?
ADB_PATH = 'adb'
# FIXME: Do we need to look in $DART_SDK?
@ -111,7 +112,7 @@ class Pids(object):
def _url_for_path(port, root, path):
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):
@ -193,13 +194,14 @@ class StartSky(object):
pids['remote_sky_server_port'] = sky_server_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)
subprocess.check_call([ADB_PATH, 'shell',
'am', 'start',
'-a', 'android.intent.action.VIEW',
'-d', sky_url])
'-d', url,
ANDROID_COMPONENT])
class StopSky(object):