Make the Sky pub package include our APK and teach sky_tool to install it

sky/tools/deploy_sdk.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 import argparse
 from datetime import datetime
 import logging
 import os
 import shutil
@@ skipping 149 matching lines @@
         sky_or_dart_filter)
 
     # Sky package
     copy_or_link(src_path('sky/framework'),
         sdk_path('packages/sky/lib/framework'), sky_or_dart_filter)
     copy_or_link(src_path('sky/assets'), sdk_path('packages/sky/lib/assets'))
     # Copy gen files every time for now:
     copy(os.path.join(build_dir, 'gen/sky'),
         sdk_path('packages/sky/lib'), gen_filter)
 
-    # Work around the fact that pub run doesn't work well right now.
-    copy(src_path('sky/sdk/packages/sky/bin/sky'),
-        sdk_path('packages/sky/lib/sky_tool'))
-
     # Sky SDK additions:
     copy_or_link(src_path('sky/engine/bindings/builtin.dart'),
         sdk_path('packages/sky/sdk_additions/dart_sky_builtins.dart'))
     bindings_path = os.path.join(build_dir, 'gen/sky/bindings')
     copy_or_link(os.path.join(bindings_path, 'dart_sky.dart'),
         sdk_path('packages/sky/sdk_additions/dart_sky.dart'))
 
 
     # Mojo package, lots of overlap with gen, must be copied:
     copy(src_path('mojo/public'), sdk_path('packages/mojo/lib/public'),
         dart_filter)
     copy(os.path.join(build_dir, 'gen/mojo'), sdk_path('packages/mojo/lib'),
         gen_filter)
 
     # Mojo SDK additions:
     copy_or_link(src_path('mojo/public/dart/bindings.dart'),
         sdk_path('packages/mojo/sdk_additions/dart_mojo_bindings.dart'))
     copy_or_link(src_path('mojo/public/dart/core.dart'),
         sdk_path('packages/mojo/sdk_additions/dart_mojo_core.dart'))
 
     if not skip_apks:
-        ensure_dir_exists(sdk_path('apks'))
+        ensure_dir_exists(sdk_path('packages/sky/apks'))
         shutil.copy(os.path.join(build_dir, 'apks', 'SkyDemo.apk'),
-            sdk_path('apks'))
+            sdk_path('packages/sky/apks'))
 
     if generate_licenses:
         with open(sdk_path('LICENSES.sky'), 'w') as license_file:
             subprocess.check_call([src_path('tools/licenses.py'), 'credits'],
                 stdout=license_file)
 
         copy_or_link(src_path('AUTHORS'), sdk_path('packages/mojo/AUTHORS'))
         copy_or_link(src_path('LICENSE'), sdk_path('packages/mojo/LICENSE'))
         copy_or_link(src_path('AUTHORS'), sdk_path('packages/sky/AUTHORS'))
         copy_or_link(src_path('LICENSE'), sdk_path('packages/sky/LICENSE'))
@@ skipping 14 matching lines @@
             'git', 'commit',
             '-m', '%s from %s' % (rel_build_dir, git_revision())
             ], cwd=sdk_root)
 
     time_delta = datetime.now() - start_time
     print 'SDK built at %s in %ss' % (sdk_root, time_delta.total_seconds())
 
 
 if __name__ == '__main__':
     main()