Attempt to stop sky_server before starting it to avoid confusion and the warning message.

R=abarth@chromium.org, eseidel@google.com

Review URL: https://codereview.chromium.org/1222913006 .
This commit is contained in:
Ian Fischer 2015-07-07 15:47:38 -07:00
parent f39e23fbeb
commit 1a2869c873

View File

@ -180,6 +180,8 @@ class StartSky(object):
print "'%s' does not exist?" % apk_path
return 2
StopSky().run(args, pids)
packages_root = dev_packages_root(args.build_dir)
sky_server = self._sky_server_for_args(args, packages_root)
pids['sky_server_pid'] = sky_server.start()
@ -382,8 +384,6 @@ class StopSky(object):
self._adb_reverse_remove(pids['remote_sky_server_port'])
if 'remote_gdbserver_port' in pids:
self._kill_if_exists('adb_shell_gdbserver_pid',
'adb shell gdbserver')
self._adb_forward_remove(pids['remote_gdbserver_port'])
subprocess.call([