works
diff --git a/examples/browser/browser.sky b/examples/browser/browser.sky
index 4d5ea7d..ce10859 100644
--- a/examples/browser/browser.sky
+++ b/examples/browser/browser.sky
@@ -8,10 +8,10 @@
<import src="/gen/examples/browser/browser_host.mojom.sky" as="example" />
-<import src="/sky/framework/embedder.sky" as="embedder" />
-<import src="/sky/framework/sky-box.sky"/>
-<import src="/sky/framework/sky-element/sky-element.sky" as="SkyElement" />
-<import src="/sky/framework/sky-input.sky" />
+<import src="/packages/sky/framework/embedder.sky" as="embedder" />
+<import src="/packages/sky/framework/sky-box.sky"/>
+<import src="/packages/sky/framework/sky-element/sky-element.sky" as="SkyElement" />
+<import src="/packages/sky/framework/sky-input.sky" />
<sky-element name="browser-panel">
<template>
diff --git a/examples/location/location.sky b/examples/location/location.sky
index 62c0193..eb574fc 100644
--- a/examples/location/location.sky
+++ b/examples/location/location.sky
@@ -9,7 +9,7 @@
import 'dart:async';
import 'dart:sky';
-import '/sky/framework/embedder.dart';
+import 'package:sky/framework/embedder.dart';
import 'package:mojo/services/location/public/interfaces/location_service.mojom.dart';
diff --git a/sky/framework/debug/shake-to-reload.sky b/sky/framework/debug/shake-to-reload.sky
index 2fc8bba..f6a3fc6 100644
--- a/sky/framework/debug/shake-to-reload.sky
+++ b/sky/framework/debug/shake-to-reload.sky
@@ -1,6 +1,6 @@
<script>
-import '/sky/framework/shell.dart' as shell;
import 'dart:sky';
+import 'package:sky/framework/shell.dart' as shell;
import 'package:sky/services/sensors/sensors.mojom.dart';
// TODO(abarth): We should factor this out into a kinematics library.
diff --git a/sky/framework/embedder.dart b/sky/framework/embedder.dart
index b3d82c1..9f7bafd 100644
--- a/sky/framework/embedder.dart
+++ b/sky/framework/embedder.dart
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import "/mojo/public/dart/application.dart";
+import "package:mojo/public/dart/application.dart";
import "dart:sky.internals" as internals;
import "dart:mojo.bindings" as bindings;
import "dart:mojo.core" as core;
diff --git a/sky/framework/shell.dart b/sky/framework/shell.dart
index d39d273..a38f8fb 100644
--- a/sky/framework/shell.dart
+++ b/sky/framework/shell.dart
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import "/mojo/public/dart/application.dart";
+import "package:mojo/public/dart/application.dart";
import "dart:sky.internals" as internals;
import "dart:mojo.core" as core;
import "package:mojo/public/interfaces/application/service_provider.mojom.dart";
diff --git a/sky/sdk/tools/sky b/sky/sdk/tools/sky
index 6890876..4c17cc0 100755
--- a/sky/sdk/tools/sky
+++ b/sky/sdk/tools/sky
@@ -7,10 +7,11 @@
import json
import logging
import os
+import signal
+import socket
import subprocess
import sys
import urlparse
-import socket
SDK_TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
SDK_ROOT = os.path.dirname(SDK_TOOLS_DIR)
@@ -118,6 +119,7 @@
start_parser.set_defaults(func=self.run)
def run(self, args, pids):
+ StopSky().run(args, pids)
if args.install:
apk_path = os.path.join(SDK_ROOT, 'apks', APK_NAME)
if not os.path.exists(apk_path):
diff --git a/sky/tests/resources/event-sender.dart b/sky/tests/resources/event-sender.dart
index 979294f..29cd743 100644
--- a/sky/tests/resources/event-sender.dart
+++ b/sky/tests/resources/event-sender.dart
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import "/sky/framework/embedder.dart";
import "dart:async";
import "dart:sky";
import "dart:sky.internals" as internals;
import "package:mojo/services/input_events/public/interfaces/input_event_constants.mojom.dart" as constants;
import "package:mojo/services/input_events/public/interfaces/input_events.mojom.dart" as events;
import "package:mojo/services/input_events/public/interfaces/input_key_codes.mojom.dart" as codes;
+import "package:sky/framework/embedder.dart";
import "package:sky/services/testing/test_harness.mojom.dart" as harness;
bool _isDone = false;
diff --git a/sky/tests/services/event-sender.sky b/sky/tests/services/event-sender.sky
index 6c58ef9..2d039b0 100644
--- a/sky/tests/services/event-sender.sky
+++ b/sky/tests/services/event-sender.sky
@@ -3,10 +3,10 @@
<script>
import "../resources/third_party/unittest/unittest.dart";
import "../resources/unit.dart";
-import "/sky/framework/embedder.dart";
import "dart:sky";
import "package:mojo/services/input_events/public/interfaces/input_event_constants.mojom.dart" as constants;
import "package:mojo/services/input_events/public/interfaces/input_events.mojom.dart" as events;
+import "package:sky/framework/embedder.dart";
import "package:sky/services/testing/test_harness.mojom.dart" as harness;
void main() {
diff --git a/sky/tests/services/iframe-embed-vmc.sky b/sky/tests/services/iframe-embed-vmc.sky
index 0ef69b5..c3f0a6a 100644
--- a/sky/tests/services/iframe-embed-vmc.sky
+++ b/sky/tests/services/iframe-embed-vmc.sky
@@ -7,10 +7,10 @@
import 'dart:sky';
import 'dart:sky.internals' as internals;
import 'dart:typed_data';
-import '/mojo/public/dart/application.dart';
import 'dart:mojo.bindings';
import 'dart:mojo.core';
+import 'package:mojo/public/dart/application.dart';
import 'package:mojo/public/interfaces/application/shell.mojom.dart' as shell_mojom;
import 'package:mojo/services/input_events/public/interfaces/input_events.mojom.dart' as input_events;
import 'package:mojo/services/view_manager/public/interfaces/view_manager.mojom.dart' as view_manager;
diff --git a/sky/tools/deploy_sdk.py b/sky/tools/deploy_sdk.py
index f499bac..3b7b5b0 100755
--- a/sky/tools/deploy_sdk.py
+++ b/sky/tools/deploy_sdk.py
@@ -126,11 +126,12 @@
copy(src_path('sky/framework'), sdk_path('packages/sky/lib/framework'),
sky_or_dart_filter)
copy(src_path('sky/assets'), sdk_path('packages/sky/lib/assets'))
+ copy(src_path('sky/sdk/tools/sky'), sdk_path('packages/sky/bin/sky'))
copy(os.path.join(build_dir, 'gen/sky'), sdk_path('packages/sky/lib'),
gen_filter)
# Mojo package
- copy(src_path('mojo'), sdk_path('packages/mojo'), dart_filter)
+ 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)
