Make package: work like Dart expects in preparation for a Sky SDK

sky/tools/skydb

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from skypy.skyserver import SkyServer
 import argparse
 import json
 import logging
 import os
@@ skipping 121 matching lines @@
         if is_android and args.gdb:
             shell_args.append('--wait-for-debugger')
 
         if 'remote_sky_server_port' in self.pids:
             shell_command = self._wrap_for_android(shell_args)
         else:
             shell_command = [self.paths.mojo_shell_path] + shell_args
 
         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. :(
         abs_build_dir = os.path.abspath(build_dir)
         root_relative_build_dir = os.path.relpath(abs_build_dir, SRC_ROOT)
         return skypy.paths.Paths(root_relative_build_dir)
 
     def _find_remote_pid_for_package(self, package):
         ps_output = subprocess.check_output([ADB_PATH, 'shell', 'ps'])
         for line in ps_output.split('\n'):
@@ skipping 22 matching lines @@
         # FIXME: This is probably not the right way to compute is_android
         # from the build directory?
         gn_args = gn_args_from_build_dir(self.paths.build_dir)
         is_android = 'android_sdk_version' in gn_args
 
         if is_android and args.gdb and not 'is_debug' in gn_args:
             # FIXME: We don't include gdbserver in the release APK...
             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
 
         self.pids['build_dir'] = self.paths.build_dir
         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.
@@ skipping 397 matching lines @@
         load_parser.set_defaults(func=self.load_command)
 
         args = parser.parse_args()
         args.func(args)
 
         self._write_pid_file(PID_FILE_PATH, self.pids)
 
 
 if __name__ == '__main__':
     SkyDebugger().main()