| Index: sky/tools/skydb
|
| diff --git a/sky/tools/skydb b/sky/tools/skydb
|
| index b3b67db2cb9675cfb90d0feb860e58a310acbbe7..36845dd17a1201082dbc43293b2f695ebd4023f4 100755
|
| --- a/sky/tools/skydb
|
| +++ b/sky/tools/skydb
|
| @@ -139,13 +139,12 @@ class SkyDebugger(object):
|
|
|
| return shell_command
|
|
|
| - def sky_server_for_args(self, args):
|
| + def sky_server_for_args(self, args, packages_root):
|
| # FIXME: This is a hack. sky_server should just take a build_dir
|
| # not a magical "configuration" name.
|
| configuration = os.path.basename(os.path.normpath(self.paths.build_dir))
|
| server_root = self._server_root_for_url(args.url_or_path)
|
| - sky_server = SkyServer(SKY_SERVER_PORT, configuration, server_root)
|
| - return sky_server
|
| + return SkyServer(SKY_SERVER_PORT, configuration, server_root, packages_root)
|
|
|
| def _create_paths_for_build_dir(self, build_dir):
|
| # skypy.paths.Paths takes a root-relative build_dir argument. :(
|
| @@ -188,7 +187,17 @@ class SkyDebugger(object):
|
| print "Cannot debug Release builds on Android"
|
| sys.exit(2)
|
|
|
| - sky_server = self.sky_server_for_args(args)
|
| + sdk_root = os.path.join(self.paths.build_dir, 'gen', 'sky_sdk')
|
| + packages_root = os.path.join(sdk_root, 'packages_root')
|
| + subprocess.check_call([
|
| + os.path.join(self.paths.sky_tools_directory, 'deploy_sdk.py'),
|
| + '--force',
|
| + '--skip-apks',
|
| + '--fake-pub-get-into', packages_root,
|
| + sdk_root,
|
| + ])
|
| +
|
| + sky_server = self.sky_server_for_args(args, packages_root)
|
| self.pids['sky_server_pid'] = sky_server.start()
|
| self.pids['sky_server_port'] = sky_server.port
|
| self.pids['sky_server_root'] = sky_server.root
|
|
|