From 7c80a8b657eeca68f3c86ca185aa209aaefa395e Mon Sep 17 00:00:00 2001
From: "P.Y. Laligand" <py.laligand@gmail.com>
Date: Wed, 30 Nov 2016 09:50:17 -0800
Subject: [PATCH] Include internal Dart libraries in sky_engine. (#3280)

This allows analysis to succeed. Otherwise we're seeing errors on List which does not appear as Iterable in core/list.dart unless one has knownledge of EfficientLengthIterable which is defined in internal/internal.dart.
---
 sky/packages/sky_engine/BUILD.gn           | 6 ++++++
 sky/packages/sky_engine/lib/_embedder.yaml | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/sky/packages/sky_engine/BUILD.gn b/sky/packages/sky_engine/BUILD.gn
index 33907c811..61c9af2f2 100644
--- a/sky/packages/sky_engine/BUILD.gn
+++ b/sky/packages/sky_engine/BUILD.gn
@@ -45,6 +45,11 @@ dart_sdk_lib_copy("developer") {
   destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk"
 }
 
+dart_sdk_lib_copy("internal") {
+  sdk_lib_name = "internal"
+  destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk"
+}
+
 dart_sdk_lib_copy("io") {
   sdk_lib_name = "io"
   destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk"
@@ -88,6 +93,7 @@ group("copy_dart_sdk") {
     ":convert",
     ":core",
     ":developer",
+    ":internal",
     ":io",
     ":isolate",
     ":math",
diff --git a/sky/packages/sky_engine/lib/_embedder.yaml b/sky/packages/sky_engine/lib/_embedder.yaml
index 320b4274b..517c4e50b 100644
--- a/sky/packages/sky_engine/lib/_embedder.yaml
+++ b/sky/packages/sky_engine/lib/_embedder.yaml
@@ -10,7 +10,11 @@ embedded_libs:
   "dart:math": "../dart_sdk/math/math.dart"
   "dart:typed_data": "../dart_sdk/typed_data/typed_data.dart"
   "dart:ui": "../dart_ui/ui.dart"
-  "dart:_internal": "../dart_sdk/_empty.dart"
+  # The internal library is needed as some implementations bleed into the public
+  # API, e.g. List being Iterable by virtue of implementing
+  # EfficientLengthIterable.
+  # Not including this library yields analysis errors.
+  "dart:_internal": "../dart_sdk/internal/internal.dart"
   "dart:nativewrappers": "../dart_sdk/_empty.dart"
 
 analyzer:
-- 
GitLab