Chromium Code Reviews| Index: pkg/analyzer/lib/src/summary/pub_summary.dart |
| diff --git a/pkg/analyzer/lib/src/summary/pub_summary.dart b/pkg/analyzer/lib/src/summary/pub_summary.dart |
| index 4bc6ce3ae2957cd88bef08bcc00485dc59c17dad..f3574a27cdb026a70bc6798c0ea9d936beee3b01 100644 |
| --- a/pkg/analyzer/lib/src/summary/pub_summary.dart |
| +++ b/pkg/analyzer/lib/src/summary/pub_summary.dart |
| @@ -243,9 +243,15 @@ class PubSummaryManager { |
| packageToNode[package.name] = node; |
| }); |
| - // Fill the store with unlinked bundles. |
| + // Fill the store with the linked SDK and unlinked package bundles. |
| SummaryDataStore store = new SummaryDataStore(const <String>[]); |
| store.addBundle(null, sdkBundle); |
| + { |
| + PackageBundle extension = computeSdkExtension(context, sdkBundle); |
| + if (extension != null) { |
| + store.addBundle(null, extension); |
| + } |
| + } |
| for (PackageBundle unlinked in unlinkedBundles.values) { |
| store.addBundle(null, unlinked); |
| } |
| @@ -529,7 +535,8 @@ class _LinkedNode extends Node<_LinkedNode> { |
| if (!uri.hasScheme) { |
| // A relative path in this package, skip it. |
| } else if (uri.scheme == 'dart') { |
| - // TODO(scheglov) link _sdkext bundles. |
| + // Dependency on the SDK is implicit and always added. |
| + // The SDK linked bundle is precomputed before linking packages. |
|
Paul Berry
2016/08/11 20:47:17
(As discussed in person) I think we still need to
|
| } else if (uriStr.startsWith('package:')) { |
| String package = PubSummaryManager.getPackageName(uriStr); |
| _LinkedNode packageNode = packageToNode[package]; |