diff --git a/sky/packages/sky_engine/BUILD.gn b/sky/packages/sky_engine/BUILD.gn index 260a755946e4b..4cf126dd58e82 100644 --- a/sky/packages/sky_engine/BUILD.gn +++ b/sky/packages/sky_engine/BUILD.gn @@ -21,59 +21,59 @@ if (!is_fuchsia) { dart_sdk_lib_copy("async") { sdk_lib_name = "async" - destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk" + destination = "$root_gen_dir/dart-pkg/sky_engine/lib" } dart_sdk_lib_copy("collection") { sdk_lib_name = "collection" - destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk" + destination = "$root_gen_dir/dart-pkg/sky_engine/lib" } dart_sdk_lib_copy("convert") { sdk_lib_name = "convert" - destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk" + destination = "$root_gen_dir/dart-pkg/sky_engine/lib" } dart_sdk_lib_copy("core") { sdk_lib_name = "core" - destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk" + destination = "$root_gen_dir/dart-pkg/sky_engine/lib" } dart_sdk_lib_copy("developer") { sdk_lib_name = "developer" - destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk" + destination = "$root_gen_dir/dart-pkg/sky_engine/lib" } dart_sdk_lib_copy("internal") { sdk_lib_name = "internal" - destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk" + destination = "$root_gen_dir/dart-pkg/sky_engine/lib" } dart_sdk_lib_copy("io") { sdk_lib_name = "io" - destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk" + destination = "$root_gen_dir/dart-pkg/sky_engine/lib" } dart_sdk_lib_copy("isolate") { sdk_lib_name = "isolate" - destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk" + destination = "$root_gen_dir/dart-pkg/sky_engine/lib" } dart_sdk_lib_copy("math") { sdk_lib_name = "math" - destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk" + destination = "$root_gen_dir/dart-pkg/sky_engine/lib" } dart_sdk_lib_copy("typed_data") { sdk_lib_name = "typed_data" - destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk" + destination = "$root_gen_dir/dart-pkg/sky_engine/lib" } copy("copy_dart_ui") { sources = dart_ui_files outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/dart_ui/{{source_file_part}}", + "$root_gen_dir/dart-pkg/sky_engine/lib/dart_ui/{{source_file_part}}", ] } @@ -96,8 +96,8 @@ dart_pkg("sky_engine") { sources = [ "LICENSE", "README.md", - "dart_sdk/_empty.dart", "lib/_embedder.yaml", + "lib/_empty.dart", "pubspec.yaml", ] diff --git a/sky/packages/sky_engine/lib/_embedder.yaml b/sky/packages/sky_engine/lib/_embedder.yaml index 2e5290c417a70..b040d8fea8ef1 100644 --- a/sky/packages/sky_engine/lib/_embedder.yaml +++ b/sky/packages/sky_engine/lib/_embedder.yaml @@ -1,20 +1,20 @@ embedded_libs: - "dart:async": "../dart_sdk/async/async.dart" - "dart:collection": "../dart_sdk/collection/collection.dart" - "dart:convert": "../dart_sdk/convert/convert.dart" - "dart:core": "../dart_sdk/core/core.dart" - "dart:developer": "../dart_sdk/developer/developer.dart" - "dart:io": "../dart_sdk/io/io.dart" - "dart:isolate": "../dart_sdk/isolate/isolate.dart" - "dart:math": "../dart_sdk/math/math.dart" - "dart:typed_data": "../dart_sdk/typed_data/typed_data.dart" - "dart:ui": "../dart_ui/ui.dart" + "dart:async": "async/async.dart" + "dart:collection": "collection/collection.dart" + "dart:convert": "convert/convert.dart" + "dart:core": "core/core.dart" + "dart:developer": "developer/developer.dart" + "dart:io": "io/io.dart" + "dart:isolate": "isolate/isolate.dart" + "dart:math": "math/math.dart" + "dart:typed_data": "typed_data/typed_data.dart" + "dart:ui": "dart_ui/ui.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" + "dart:_internal": "internal/internal.dart" + "dart:nativewrappers": "_empty.dart" analyzer: language: diff --git a/sky/packages/sky_engine/dart_sdk/_empty.dart b/sky/packages/sky_engine/lib/_empty.dart similarity index 100% rename from sky/packages/sky_engine/dart_sdk/_empty.dart rename to sky/packages/sky_engine/lib/_empty.dart