Isolate imports of generated Dart code from generated path (#5960)

This rewrites imports of various mojom.dart files from the Flutter
engine repo to instead import normal-looking dart files from the
(new) flutter_services package. This package handles exporting the
correct symbols from generated code wherever that may live.

Includes an engine roll to 3551e7a48e2e336777b15c7637af92fd7605b6c5
which contains the new flutter_services package.

bin/cache/engine.version

-1b73d4d06f2bfda32b07ae4e73729c8e8ed7695c
+3551e7a48e2e336777b15c7637af92fd7605b6c5

dev/manual_tests/raw_keyboard.dart

@@ -4,7 +4,7 @@
 
 import 'package:flutter/material.dart';
 
-import 'package:sky_services/sky/input_event.mojom.dart' as mojom;
+import 'package:flutter_services/input_event.dart' as mojom;
 
 GlobalKey _key = new GlobalKey();
 

examples/layers/raw/touch_input.dart

@@ -10,7 +10,7 @@ import 'dart:typed_data';
 
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
-import 'package:sky_services/pointer/pointer.mojom.dart';
+import 'package:flutter_services/pointer.dart';
 
 ui.Color color;
 

examples/layers/services/media_service.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:sky_services/media/media.mojom.dart' as mojom;
+import 'package:flutter_services/media.dart' as mojom;
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';

packages/flutter/lib/src/gestures/binding.dart

@@ -10,7 +10,7 @@ import 'dart:ui' as ui show window;
 import 'package:flutter/foundation.dart';
 import 'package:mojo/bindings.dart' as mojo_bindings;
 import 'package:mojo/core.dart' as mojo_core;
-import 'package:sky_services/pointer/pointer.mojom.dart';
+import 'package:flutter_services/pointer.dart';
 
 import 'arena.dart';
 import 'converter.dart';

packages/flutter/lib/src/gestures/converter.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 'package:sky_services/pointer/pointer.mojom.dart' as mojom;
+import 'package:flutter_services/pointer.dart' as mojom;
 
 import 'events.dart';
 

packages/flutter/lib/src/material/app_bar.dart

@@ -4,7 +4,7 @@
 
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
-import 'package:sky_services/flutter/platform/system_chrome.mojom.dart' as mojom;
+import 'package:flutter_services/platform/system_chrome.dart' as mojom;
 
 import 'constants.dart';
 import 'icon_theme.dart';

packages/flutter/lib/src/material/input.dart

@@ -14,7 +14,7 @@ import 'material.dart';
 import 'text_selection.dart';
 import 'theme.dart';
 
-export 'package:sky_services/editing/editing.mojom.dart' show KeyboardType;
+export 'package:flutter_services/editing.dart' show KeyboardType;
 
 /// A material design text input field.
 ///

packages/flutter/lib/src/rendering/binding.dart

@@ -10,7 +10,7 @@ import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
 import 'package:mojo/core.dart' as core;
-import 'package:sky_services/semantics/semantics.mojom.dart' as mojom;
+import 'package:flutter_services/semantics.dart' as mojom;
 
 import 'box.dart';
 import 'debug.dart';

packages/flutter/lib/src/rendering/child_view.dart

@@ -7,13 +7,13 @@ import 'dart:collection';
 import 'dart:ui' as ui;
 
 import 'package:flutter/services.dart';
-import 'package:mojo_services/mojo/gfx/composition/scene_token.mojom.dart' as mojom;
-import 'package:mojo_services/mojo/ui/view_containers.mojom.dart' as mojom;
-import 'package:mojo_services/mojo/ui/view_provider.mojom.dart' as mojom;
-import 'package:mojo_services/mojo/ui/view_properties.mojom.dart' as mojom;
-import 'package:mojo_services/mojo/ui/view_token.mojom.dart' as mojom;
-import 'package:mojo_services/mojo/ui/views.mojom.dart' as mojom;
-import 'package:mojo_services/mojo/geometry.mojom.dart' as mojom;
+import 'package:flutter_services/mojo/gfx/composition/scene_token.dart' as mojom;
+import 'package:flutter_services/mojo/ui/view_containers.dart' as mojom;
+import 'package:flutter_services/mojo/ui/view_provider.dart' as mojom;
+import 'package:flutter_services/mojo/ui/view_properties.dart' as mojom;
+import 'package:flutter_services/mojo/ui/view_token.dart' as mojom;
+import 'package:flutter_services/mojo/ui/views.dart' as mojom;
+import 'package:flutter_services/mojo/geometry.dart' as mojom;
 import 'package:mojo/application.dart';
 import 'package:mojo/core.dart' as core;
 import 'package:mojo/mojo/service_provider.mojom.dart' as mojom;

packages/flutter/lib/src/rendering/layer.dart

@@ -8,7 +8,7 @@ import 'dart:ui' show Offset;
 import 'package:flutter/painting.dart';
 import 'package:vector_math/vector_math_64.dart';
 import 'package:meta/meta.dart';
-import 'package:mojo_services/mojo/gfx/composition/scene_token.mojom.dart' as mojom;
+import 'package:flutter_services/mojo/gfx/composition/scene_token.dart' as mojom;
 
 import 'debug.dart';
 

packages/flutter/lib/src/rendering/object.dart

@@ -10,7 +10,7 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/painting.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:meta/meta.dart';
-import 'package:mojo_services/mojo/gfx/composition/scene_token.mojom.dart' as mojom;
+import 'package:flutter_services/mojo/gfx/composition/scene_token.dart' as mojom;
 import 'package:vector_math/vector_math_64.dart';
 
 import 'debug.dart';

packages/flutter/lib/src/rendering/semantics.dart

@@ -8,7 +8,7 @@ import 'dart:ui' show Rect;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/painting.dart';
 import 'package:meta/meta.dart';
-import 'package:sky_services/semantics/semantics.mojom.dart' as mojom;
+import 'package:flutter_services/semantics.dart' as mojom;
 import 'package:vector_math/vector_math_64.dart';
 
 import 'node.dart';

packages/flutter/lib/src/services/activity.dart

@@ -4,11 +4,11 @@
 
 import 'dart:ui';
 
-import 'package:sky_services/activity/activity.mojom.dart';
+import 'package:flutter_services/activity.dart';
 
 import 'shell.dart';
 
-export 'package:sky_services/activity/activity.mojom.dart' show Activity, Intent, ComponentName, StringExtra;
+export 'package:flutter_services/activity.dart' show Activity, Intent, ComponentName, StringExtra;
 
 
 // Dart wrapper around Activity mojo service available in Flutter on Android.

packages/flutter/lib/src/services/asset_bundle.dart

@@ -11,7 +11,7 @@ import 'dart:typed_data';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/http.dart' as http;
 import 'package:mojo/core.dart' as core;
-import 'package:mojo_services/mojo/asset_bundle/asset_bundle.mojom.dart' as mojom;
+import 'package:flutter_services/mojo/asset_bundle/asset_bundle.dart' as mojom;
 
 /// A collection of resources used by the application.
 ///

packages/flutter/lib/src/services/clipboard.dart

@@ -4,11 +4,11 @@
 
 import 'dart:async';
 
-import 'package:sky_services/editing/editing.mojom.dart' as mojom;
+import 'package:flutter_services/editing.dart' as mojom;
 
 import 'shell.dart';
 
-export 'package:sky_services/editing/editing.mojom.dart' show ClipboardData;
+export 'package:flutter_services/editing.dart' show ClipboardData;
 
 mojom.ClipboardProxy _initClipboardProxy() {
   return shell.connectToApplicationService('mojo:clipboard', mojom.Clipboard.connectToService);

packages/flutter/lib/src/services/haptic_feedback.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:sky_services/flutter/platform/haptic_feedback.mojom.dart' as mojom;
+import 'package:flutter_services/platform/haptic_feedback.dart' as mojom;
 
 import 'shell.dart';
 

packages/flutter/lib/src/services/host_messages.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:mojo/core.dart' as core;
-import 'package:sky_services/flutter/platform/app_messages.mojom.dart' as mojom;
+import 'package:flutter_services/platform/app_messages.dart' as mojom;
 
 import 'shell.dart';
 

packages/flutter/lib/src/services/keyboard.dart

@@ -4,11 +4,11 @@
 
 import 'dart:async';
 
-import 'package:sky_services/editing/editing.mojom.dart' as mojom;
+import 'package:flutter_services/editing.dart' as mojom;
 
 import 'shell.dart';
 
-export 'package:sky_services/editing/editing.mojom.dart' show KeyboardType;
+export 'package:flutter_services/editing.dart' show KeyboardType;
 
 /// An interface to the system's keyboard.
 ///

packages/flutter/lib/src/services/path_provider.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:sky_services/flutter/platform/path_provider.mojom.dart' as mojom;
+import 'package:flutter_services/platform/path_provider.dart' as mojom;
 
 import 'shell.dart';
 

packages/flutter/lib/src/services/system_chrome.dart

@@ -4,13 +4,13 @@
 
 import 'dart:async';
 
-import 'package:sky_services/flutter/platform/system_chrome.mojom.dart' as mojom;
-import 'package:sky_services/flutter/platform/system_chrome.mojom.dart'
+import 'package:flutter_services/platform/system_chrome.dart' as mojom;
+import 'package:flutter_services/platform/system_chrome.dart'
     show DeviceOrientation, SystemUiOverlay, SystemUiOverlayStyle;
 
 import 'shell.dart';
 
-export 'package:sky_services/flutter/platform/system_chrome.mojom.dart'
+export 'package:flutter_services/platform/system_chrome.dart'
     show DeviceOrientation, SystemUiOverlay, SystemUiOverlayStyle;
 
 mojom.SystemChromeProxy _initSystemChromeProxy() {

packages/flutter/lib/src/services/system_sound.dart

@@ -4,12 +4,12 @@
 
 import 'dart:async';
 
-import 'package:sky_services/flutter/platform/system_sound.mojom.dart' as mojom;
-import 'package:sky_services/flutter/platform/system_sound.mojom.dart' show SystemSoundType;
+import 'package:flutter_services/platform/system_sound.dart' as mojom;
+import 'package:flutter_services/platform/system_sound.dart' show SystemSoundType;
 
 import 'shell.dart';
 
-export 'package:sky_services/flutter/platform/system_sound.mojom.dart' show SystemSoundType;
+export 'package:flutter_services/platform/system_sound.dart' show SystemSoundType;
 
 mojom.SystemSoundProxy _initSystemSoundProxy() {
   return shell.connectToApplicationService('mojo:flutter_platform', mojom.SystemSound.connectToService);

packages/flutter/lib/src/services/url_launcher.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:sky_services/flutter/platform/url_launcher.mojom.dart' as mojom;
+import 'package:flutter_services/platform/url_launcher.dart' as mojom;
 import 'shell.dart';
 
 mojom.UrlLauncherProxy _initUrlLauncherProxy() {

packages/flutter/lib/src/widgets/editable.dart

@@ -7,7 +7,7 @@ import 'dart:async';
 import 'package:flutter/rendering.dart' show RenderEditableLine, SelectionChangedHandler;
 import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
-import 'package:sky_services/editing/editing.mojom.dart' as mojom;
+import 'package:flutter_services/editing.dart' as mojom;
 
 import 'basic.dart';
 import 'focus.dart';
@@ -18,7 +18,7 @@ import 'scrollable.dart';
 import 'text_selection.dart';
 
 export 'package:flutter/painting.dart' show TextSelection;
-export 'package:sky_services/editing/editing.mojom.dart' show KeyboardType;
+export 'package:flutter_services/editing.dart' show KeyboardType;
 
 const Duration _kCursorBlinkHalfPeriod = const Duration(milliseconds: 500);
 

packages/flutter/lib/src/widgets/raw_keyboard_listener.dart

@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:flutter/services.dart';
-import 'package:sky_services/raw_keyboard/raw_keyboard.mojom.dart' as mojom;
-import 'package:sky_services/sky/input_event.mojom.dart' as mojom;
+import 'package:flutter_services/raw_keyboard.dart' as mojom;
+import 'package:flutter_services/input_event.dart' as mojom;
 
 import 'basic.dart';
 import 'framework.dart';

packages/flutter/lib/src/widgets/semantics_debugger.dart

@@ -8,7 +8,7 @@ import 'dart:math' as math;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/rendering.dart';
-import 'package:sky_services/semantics/semantics.mojom.dart' as mojom;
+import 'package:flutter_services/semantics.dart' as mojom;
 
 import 'basic.dart';
 import 'binding.dart';

packages/flutter/pubspec.yaml

@@ -15,10 +15,10 @@ dependencies:
   async: "^1.10.0"
   http_parser: ">=0.0.1 <4.0.0"
 
+  flutter_services:
+    path: ../../bin/cache/pkg/flutter_services
   sky_engine:
     path: ../../bin/cache/pkg/sky_engine
-  sky_services:
-    path: ../../bin/cache/pkg/sky_services
 
 dev_dependencies:
   flutter_test:

packages/flutter/test/gestures/gesture_binding_test.dart

@@ -7,7 +7,7 @@ import 'dart:ui' as ui;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:mojo/bindings.dart' as mojo_bindings;
-import 'package:sky_services/pointer/pointer.mojom.dart';
+import 'package:flutter_services/pointer.dart';
 import 'package:test/test.dart';
 
 typedef void HandleEventCallback(PointerEvent event);

packages/flutter/test/rendering/test_semantics_client.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/rendering.dart';
-import 'package:sky_services/semantics/semantics.mojom.dart' as mojom;
+import 'package:flutter_services/semantics.dart' as mojom;
 
 class TestSemanticsClient {
   TestSemanticsClient(PipelineOwner pipelineOwner) {

packages/flutter/test/services/system_chrome_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:sky_services/flutter/platform/system_chrome.mojom.dart' as mojom;
+import 'package:flutter_services/platform/system_chrome.dart' as mojom;
 
 void main() {
   testWidgets('SystemChrome overlay style test', (WidgetTester tester) async {

packages/flutter/test/widget/buttons_test.dart

@@ -5,7 +5,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:sky_services/semantics/semantics.mojom.dart' as mojom;
+import 'package:flutter_services/semantics.dart' as mojom;
 
 import '../rendering/test_semantics_client.dart';
 

packages/flutter/test/widget/form_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter/material.dart';
-import 'package:sky_services/editing/editing.mojom.dart' as mojom;
+import 'package:flutter_services/editing.dart' as mojom;
 
 class MockKeyboard extends mojom.KeyboardProxy {
   MockKeyboard() : super.unbound();

packages/flutter/test/widget/input_test.dart

@@ -7,7 +7,7 @@ import 'dart:async';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:sky_services/editing/editing.mojom.dart' as mojom;
+import 'package:flutter_services/editing.dart' as mojom;
 
 class MockKeyboard extends mojom.KeyboardProxy {
   MockKeyboard() : super.unbound();

packages/flutter/test/widget/semantics_7_test.dart

@@ -5,7 +5,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:sky_services/semantics/semantics.mojom.dart' as mojom;
+import 'package:flutter_services/semantics.dart' as mojom;
 
 import '../rendering/test_semantics_client.dart';
 

packages/flutter/test/widget/semantics_test.dart

@@ -5,7 +5,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:sky_services/semantics/semantics.mojom.dart' as mojom;
+import 'package:flutter_services/semantics.dart' as mojom;
 
 import '../rendering/test_semantics_client.dart';
 

packages/flutter_sprites/lib/flutter_sprites.dart

@@ -19,7 +19,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:meta/meta.dart';
 import 'package:mojo/core.dart';
-import 'package:sky_services/media/media.mojom.dart';
+import 'package:flutter_services/media.dart';
 import 'package:vector_math/vector_math_64.dart';
 
 part 'src/action.dart';

packages/flutter_tools/lib/src/cache.dart

@@ -242,13 +242,14 @@ class FlutterEngine {
   FlutterEngine(this.cache);
 
   static const String kName = 'engine';
+  static const String kFlutterServices = 'flutter_services';
   static const String kSkyEngine = 'sky_engine';
   static const String kSkyServices = 'sky_services';
   static const String kSdkBundle = 'sdk.ds';
 
   final Cache cache;
 
-  List<String> _getPackageDirs() => const <String>[kSkyEngine, kSkyServices];
+  List<String> _getPackageDirs() => const <String>[kSkyEngine, kSkyServices, kFlutterServices];
 
   List<String> _getEngineDirs() {
     List<String> dirs = <String>[
@@ -341,9 +342,9 @@ class FlutterEngine {
 
     Status summaryStatus = logger.startProgress('Building Dart SDK summary...');
     try {
+      String flutterServicesPath = path.join(pkgDir.path, kFlutterServices);
       String skyEnginePath = path.join(pkgDir.path, kSkyEngine);
-      String skyServicesPath = path.join(pkgDir.path, kSkyServices);
-      buildSkyEngineSdkSummary(skyEnginePath, skyServicesPath, kSdkBundle);
+      buildSkyEngineSdkSummary(skyEnginePath, flutterServicesPath, kSdkBundle);
     } finally {
       summaryStatus.stop(showElapsedTime: true);
     }

packages/flutter_tools/lib/src/commands/analyze.dart

@@ -203,12 +203,6 @@ class AnalyzeCommand extends FlutterCommand {
     }
     Map<String, String> packages = dependencies.asPackageMap();
 
-    // override the sky_engine and sky_services packages if the user is using a local build
-    if (tools.engineBuildPath != null) {
-      packages['sky_engine'] = path.join(tools.engineBuildPath, 'gen/dart-pkg/sky_engine/lib');
-      packages['sky_services'] = path.join(tools.engineBuildPath, 'gen/dart-pkg/sky_services/lib');
-    }
-
     Cache.releaseLockEarly();
 
     if (argResults['preamble']) {

packages/flutter_tools/lib/src/commands/packages.dart

@@ -71,6 +71,8 @@ class PackagesGetCommand extends FlutterCommand {
       return 1;
     }
 
+    // TODO: If the user is using a local build, we should use the packages from their build instead of the cache.
+
     return pubGet(directory: target, upgrade: upgrade, checkLastModified: false);
   }
 }

packages/flutter_tools/lib/src/dart/summary.dart

@@ -17,18 +17,18 @@ import 'package:package_config/packages.dart';
 import 'package:path/path.dart' as pathos;
 import 'package:yaml/src/yaml_node.dart'; // ignore: implementation_imports
 
-/// Given the [skyEnginePath] and [skyServicesPath], locate corresponding
+/// Given the [skyEnginePath] and [flutterServicesPath], locate corresponding
 /// `_embedder.yaml` and `_sdkext`, compose the full embedded Dart SDK, and
 /// build the [outBundleName] file with its linked summary.
 void buildSkyEngineSdkSummary(
-    String skyEnginePath, String skyServicesPath, String outBundleName) {
+    String skyEnginePath, String flutterServicesPath, String outBundleName) {
   ResourceProvider resourceProvider = PhysicalResourceProvider.INSTANCE;
 
   ContextBuilder builder = new ContextBuilder(resourceProvider, null, null);
-  Packages packages = builder.createPackageMap(skyServicesPath);
+  Packages packages = builder.createPackageMap(flutterServicesPath);
   Map<String, List<Folder>> packageMap = builder.convertPackagesToMap(packages);
   if (packageMap == null) {
-    printError('The expected .packages was not found in $skyServicesPath.');
+    printError('The expected .packages was not found in $flutterServicesPath.');
     return;
   }
   packageMap['sky_engine'] = <Folder>[