From eca04d99389d344639691d7df4540374c3d70aec Mon Sep 17 00:00:00 2001
From: John McCutchan <john@johnmccutchan.com>
Date: Mon, 18 May 2015 14:41:39 -0700
Subject: [PATCH] Rationalize Dart mojo and sky package structure.

NOTE: This CL appears far larger than it actually is for two reasons:

1) Many files were moved around to use the Dart package directory structure.
2) Many .dart files had to have import paths updated.

- Organize mojo/public/dart so that it uses standard Dart package layout
- Organize mojo/dart/apptest so that it uses a standard Dart package layout
- Organize sky/sdk so that it uses a standard Dart package layout
- Create a mojo/testing package (used by unittests)
- Introduce the 'dart_pkg' gn rule which populates gen/Config/dart-pkg
- All internally vended Dart packages must have a corresponding dart_pkg rule
- It is now possible to use dependency_overrides: in pubspec.yaml to mix internal and external package dependencies (enables analyzer, editor, webstorm usage for internal developers).
- Package root for dart content handler ends with "packages/"
- Imports of mojo package uris no longer need the "public/dart"
- mojo/public/tools/dart_package.py is a clone of mojo/public/tools/gn/zip.py
- Sky tests no longer run 'deploy_sdk' script.

R=eseidel@chromium.org

Review URL: https://codereview.chromium.org/1132063007
---
 engine/src/flutter/BUILD.gn                            | 1 +
 engine/src/flutter/assets/.gitignore                   | 1 -
 engine/src/flutter/assets/material-design-icons.sha1   | 1 -
 engine/src/flutter/tests/services/iframe-embed-vmc.sky | 6 +++---
 engine/src/flutter/tests/services/network.sky          | 7 ++++---
 5 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 engine/src/flutter/assets/.gitignore
 delete mode 100644 engine/src/flutter/assets/material-design-icons.sha1

diff --git a/engine/src/flutter/BUILD.gn b/engine/src/flutter/BUILD.gn
index 961a5702502..368f601f070 100644
--- a/engine/src/flutter/BUILD.gn
+++ b/engine/src/flutter/BUILD.gn
@@ -9,6 +9,7 @@ group("sky") {
   testonly = true
 
   deps = [
+    "//sky/sdk",
     "//sky/engine/platform:platform_unittests",
     "//sky/engine/web:sky_unittests",
     "//sky/engine/wtf:unittests",
diff --git a/engine/src/flutter/assets/.gitignore b/engine/src/flutter/assets/.gitignore
deleted file mode 100644
index 91b6e9d20c9..00000000000
--- a/engine/src/flutter/assets/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-material-design-icons
diff --git a/engine/src/flutter/assets/material-design-icons.sha1 b/engine/src/flutter/assets/material-design-icons.sha1
deleted file mode 100644
index 5c2c75a2288..00000000000
--- a/engine/src/flutter/assets/material-design-icons.sha1
+++ /dev/null
@@ -1 +0,0 @@
-38ab35b5e5a6907852ad6e1a8e4a93da02f79591
\ No newline at end of file
diff --git a/engine/src/flutter/tests/services/iframe-embed-vmc.sky b/engine/src/flutter/tests/services/iframe-embed-vmc.sky
index 6fe8ed06d3f..fddaab5e28c 100644
--- a/engine/src/flutter/tests/services/iframe-embed-vmc.sky
+++ b/engine/src/flutter/tests/services/iframe-embed-vmc.sky
@@ -8,9 +8,9 @@ import 'dart:sky';
 import 'dart:sky.internals' as internals;
 import 'dart:typed_data';
 
-import 'package:mojo/public/dart/application.dart';
-import 'package:mojo/public/dart/bindings.dart';
-import 'package:mojo/public/dart/core.dart';
+import 'package:mojo/application.dart';
+import 'package:mojo/bindings.dart';
+import 'package:mojo/core.dart';
 import 'package:mojom/mojo/shell.mojom.dart' as shell_mojom;
 import 'package:mojom/mojo/input_events.mojom.dart' as input_events;
 import 'package:mojom/mojo/view_manager.mojom.dart' as view_manager;
diff --git a/engine/src/flutter/tests/services/network.sky b/engine/src/flutter/tests/services/network.sky
index 810db1550f3..2f64bf62bbd 100644
--- a/engine/src/flutter/tests/services/network.sky
+++ b/engine/src/flutter/tests/services/network.sky
@@ -1,16 +1,17 @@
 #!mojo mojo:sky_viewer
 <sky>
 <script>
-import '/sky/framework/embedder.dart';
 import 'dart:async';
 import 'dart:typed_data';
 import "dart:sky.internals" as internals;
 
-import 'package:mojo/public/dart/bindings.dart';
-import 'package:mojo/public/dart/core.dart';
+import 'package:mojo/bindings.dart';
+import 'package:mojo/core.dart';
 import 'package:mojom/mojo/network_service.mojom.dart';
 import 'package:mojom/mojo/url_loader.mojom.dart';
 
+import 'package:sky/framework/embedder.dart';
+
 Future<String> run(url) async {
   var networkService= new NetworkServiceProxy.unbound();
   embedder.connectToService("mojo:network_service", networkService);