diff --git a/dev/tools/dartdoc.dart b/dev/tools/dartdoc.dart index 49bc2259ce..9c0d6d89c4 100644 --- a/dev/tools/dartdoc.dart +++ b/dev/tools/dartdoc.dart @@ -74,11 +74,6 @@ dependencies: args.add(name.substring(0, name.length - 5)); } - findSkyServicesLibraryNames().forEach((String libName) { - args.add('--include-external'); - args.add(libName); - }); - process = await Process.start('pub', args, workingDirectory: 'dev/docs'); printStream(process.stdout); printStream(process.stderr); @@ -131,21 +126,6 @@ void putRedirectInOldIndexLocation() { new File('$kDocRoot/flutter/index.html').writeAsStringSync(metaTag); } -List findSkyServicesLibraryNames() { - Directory skyServicesLocation = new Directory('bin/cache/pkg/sky_services/lib'); - if (!skyServicesLocation.existsSync()) { - throw 'Did not find sky_services package location in ${skyServicesLocation.path}.'; - } - return skyServicesLocation.listSync(followLinks: false, recursive: true) - .where((FileSystemEntity entity) { - return entity is File && entity.path.endsWith('.mojom.dart'); - }).map((FileSystemEntity entity) { - String basename = path.basename(entity.path); - basename = basename.substring(0, basename.length-('.dart'.length)); - return basename.replaceAll('.', '_'); - }); -} - List findPackageNames() { return findPackages().map((Directory dir) => path.basename(dir.path)).toList(); } diff --git a/packages/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml index c650614618..ef53fcc37c 100644 --- a/packages/flutter/pubspec.yaml +++ b/packages/flutter/pubspec.yaml @@ -15,8 +15,6 @@ 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 diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index e69bf2e74d..23eccfed30 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -245,14 +245,12 @@ 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 _getPackageDirs() => const [kSkyEngine, kSkyServices, kFlutterServices]; + List _getPackageDirs() => const [kSkyEngine]; List _getEngineDirs() { List dirs = [ @@ -345,9 +343,8 @@ 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); - buildSkyEngineSdkSummary(skyEnginePath, flutterServicesPath, kSdkBundle); + buildSkyEngineSdkSummary(skyEnginePath, kSdkBundle); } finally { summaryStatus.stop(showElapsedTime: true); } diff --git a/packages/flutter_tools/lib/src/commands/build_aot.dart b/packages/flutter_tools/lib/src/commands/build_aot.dart index 9985fba115..e5543c0258 100644 --- a/packages/flutter_tools/lib/src/commands/build_aot.dart +++ b/packages/flutter_tools/lib/src/commands/build_aot.dart @@ -161,9 +161,6 @@ Future _buildAotSnapshot( return null; } - String mojoPkg = _getSdkExtensionPath(packageMap, 'mojo'); - String mojoInternalPath = path.join(mojoPkg, 'sdk_ext', 'internal.dart'); - String skyEnginePkg = _getSdkExtensionPath(packageMap, 'sky_engine'); String uiPath = path.join(skyEnginePkg, 'dart_ui', 'ui.dart'); String jniPath = path.join(skyEnginePkg, 'dart_jni', 'jni.dart'); @@ -173,7 +170,6 @@ Future _buildAotSnapshot( genSnapshot, vmEntryPoints, ioEntryPoints, - mojoInternalPath, uiPath, jniPath, vmServicePath, @@ -218,7 +214,6 @@ Future _buildAotSnapshot( '--vm_isolate_snapshot=$vmIsolateSnapshot', '--isolate_snapshot=$isolateSnapshot', '--packages=${packageMap.packagesPath}', - '--url_mapping=dart:mojo.internal,$mojoInternalPath', '--url_mapping=dart:ui,$uiPath', '--url_mapping=dart:jni,$jniPath', '--url_mapping=dart:vmservice_sky,$vmServicePath', diff --git a/packages/flutter_tools/lib/src/dart/summary.dart b/packages/flutter_tools/lib/src/dart/summary.dart index 7c44467114..e31172e324 100644 --- a/packages/flutter_tools/lib/src/dart/summary.dart +++ b/packages/flutter_tools/lib/src/dart/summary.dart @@ -3,7 +3,6 @@ import 'dart:io' as io; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; -import 'package:analyzer/source/sdk_ext.dart'; import 'package:analyzer/src/context/builder.dart'; // ignore: implementation_imports import 'package:analyzer/src/dart/sdk/sdk.dart'; // ignore: implementation_imports import 'package:analyzer/src/generated/engine.dart'; // ignore: implementation_imports @@ -13,27 +12,20 @@ import 'package:analyzer/src/summary/pub_summary.dart'; // ignore: implementatio import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/dart/pub.dart'; import 'package:flutter_tools/src/globals.dart'; -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 [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 flutterServicesPath, String outBundleName) { +/// Given the [skyEnginePath], locate corresponding `_embedder.yaml` and compose +/// the full embedded Dart SDK, and build the [outBundleName] file with its +/// linked summary. +void buildSkyEngineSdkSummary(String skyEnginePath, String outBundleName) { ResourceProvider resourceProvider = PhysicalResourceProvider.INSTANCE; - ContextBuilder builder = new ContextBuilder(resourceProvider, null, null); - Packages packages = builder.createPackageMap(flutterServicesPath); - Map> packageMap = builder.convertPackagesToMap(packages); - if (packageMap == null) { - printError('The expected .packages was not found in $flutterServicesPath.'); - return; - } - packageMap['sky_engine'] = [ - resourceProvider.getFolder(pathos.join(skyEnginePath, 'lib')) - ]; + Map> packageMap = >{ + 'sky_engine': [ + resourceProvider.getFolder(pathos.join(skyEnginePath, 'lib')) + ] + }; // // Read the `_embedder.yaml` file. @@ -46,22 +38,10 @@ void buildSkyEngineSdkSummary( return; } - // - // Read the `_sdkext` file. - // - SdkExtUriResolver extResolver = new SdkExtUriResolver(packageMap); - Map urlMappings = extResolver.urlMappings; - if (embedderYamls.length != 1) { - printError('Exactly one extension library was expected in $packageMap, ' - 'but $urlMappings found.'); - return; - } - // // Create the EmbedderSdk instance. // EmbedderSdk sdk = new EmbedderSdk(resourceProvider, embedderYamls); - sdk.addExtensions(urlMappings); sdk.analysisOptions = new AnalysisOptionsImpl()..strongMode = true; //