From e66af1376c80f5931b1fb5791012b3f7028a19a6 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Thu, 12 Feb 2015 13:37:50 -0800 Subject: [PATCH] skydb shouldn't use origin on Linux Unfortunately, using --origin on Linux is slow and too painful to use at the moment. We should work on fixing that, but currently many of us have this in our local working copy anyway. R=eseidel@chromium.org Review URL: https://codereview.chromium.org/922823002 --- engine/src/flutter/tools/skydb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/engine/src/flutter/tools/skydb b/engine/src/flutter/tools/skydb index 4c22df7252..b7a4aa907f 100755 --- a/engine/src/flutter/tools/skydb +++ b/engine/src/flutter/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.