From cc12331d63d894cd904d2d2155feb74805d7d9cf Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Mon, 23 Mar 2015 13:22:38 -0700 Subject: [PATCH] Update references to Mojo core and bindings Build fix after recent Dart bindings refactoring. Now that these libraries are not included in the snapshot, we need to load them from the mojo package. R=zra@google.com TBR=zra@chromium.org Review URL: https://codereview.chromium.org/1029683002 --- examples/terminal/terminal_file_impl.dart | 2 +- framework/net/fetch.dart | 2 +- framework/shell.dart | 4 ++-- tools/shelldb | 5 ----- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/examples/terminal/terminal_file_impl.dart b/examples/terminal/terminal_file_impl.dart index e9978c2dcc8..97d040cf3dc 100644 --- a/examples/terminal/terminal_file_impl.dart +++ b/examples/terminal/terminal_file_impl.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'dart:core'; -import 'dart:mojo.core'; +import 'package:mojo/public/dart/core.dart' as core; import 'package:mojo/services/files/public/interfaces/file.mojom.dart' as files; import 'package:mojo/services/files/public/interfaces/types.mojom.dart' as files; diff --git a/framework/net/fetch.dart b/framework/net/fetch.dart index a2ac890baf4..edb981b45b3 100644 --- a/framework/net/fetch.dart +++ b/framework/net/fetch.dart @@ -4,9 +4,9 @@ import '../shell.dart' as shell; import 'dart:async'; -import 'dart:mojo.core' as core; import 'dart:sky' as sky; import 'dart:typed_data'; +import 'package:mojo/public/dart/core.dart' as core; import 'package:mojo/services/network/public/interfaces/network_service.mojom.dart'; import 'package:mojo/services/network/public/interfaces/url_loader.mojom.dart'; diff --git a/framework/shell.dart b/framework/shell.dart index a38f8fbd2d8..86a71a4c229 100644 --- a/framework/shell.dart +++ b/framework/shell.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import "package:mojo/public/dart/application.dart"; import "dart:sky.internals" as internals; -import "dart:mojo.core" as core; +import "package:mojo/public/dart/application.dart"; import "package:mojo/public/interfaces/application/service_provider.mojom.dart"; +import 'package:mojo/public/dart/core.dart' as core; ApplicationConnection _initConnection() { int rawHandle = internals.takeServicesProvidedByEmbedder(); diff --git a/tools/shelldb b/tools/shelldb index b52bd27b5aa..59513217ab4 100755 --- a/tools/shelldb +++ b/tools/shelldb @@ -218,14 +218,9 @@ class Analyze(object): sky_builtin_path = \ os.path.join(SRC_ROOT, 'sky/engine/bindings/builtin.dart') dart_sky_path = os.path.join(bindings_path, 'dart_sky.dart') - mojo_bindings_path = \ - os.path.join(SRC_ROOT, 'mojo/public/dart/bindings.dart') - mojo_core_path = os.path.join(SRC_ROOT, 'mojo/public/dart/core.dart') analyzer_args = [ANALYZER_PATH, "--url-mapping=dart:sky,%s" % dart_sky_path, "--url-mapping=dart:sky_builtin,%s" % sky_builtin_path, - "--url-mapping=dart:mojo.bindings,%s" % mojo_bindings_path, - "--url-mapping=dart:mojo.core,%s" % mojo_core_path, args.app_path ] subprocess.call(analyzer_args)