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

Unified Diff: sky/tools/skydb

Issue 922823002: skydb shouldn't use origin on Linux (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/skydb
diff --git a/sky/tools/skydb b/sky/tools/skydb
index 4c22df7252f0438fc55b716415b5c420bc48b3cc..b7a4aa907f1a089b01d8a0849bc1a25f6b11c86a 100755
--- a/sky/tools/skydb
+++ b/sky/tools/skydb
@@ -118,7 +118,11 @@ class SkyDebugger(object):
remote_server_port,
self.pids['sky_server_root'],
self.pids['build_dir'])
- shell_args += ['--origin=%s' % build_dir_url]
+
+ # TODO(eseidel): We should do this on linux, but we need to fix
+ # mojo http loading to be faster first.
+ if is_android:
+ shell_args += ['--origin=%s' % build_dir_url]
# Desktop-only work-around for mojo crashing under chromoting.
if not is_android and args.use_osmesa:
@@ -194,6 +198,8 @@ class SkyDebugger(object):
self.pids['sky_command_port'] = args.command_port
if is_android:
+ # TODO(eseidel): This should move into a helper method and handle
+ # failures with nice messages explaining how to get root.
subprocess.check_call([ADB_PATH, 'root'])
# We could make installing conditional on an argument.
« 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