Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: sky/tools/shelldb

Issue 1222913006: Attempt to stop sky_server before starting it to avoid confusion and the warning message. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/tools/shelldb
diff --git a/sky/tools/shelldb b/sky/tools/shelldb
index 48420db3e814ccea2142fa069a18bb6827a430c2..ae1c588d2defdb9d66c2e5d247168638d8e0487f 100755
--- a/sky/tools/shelldb
+++ b/sky/tools/shelldb
@@ -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([
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698