Revert "Merge pull request #2428 from johnmccutchan/embedder_yaml"

This reverts commit 93b11edc82, reversing
changes made to cb4107191d.

This was requested by @johnmccutchan because this change broke the
analyzer, which only uses SDK version 1.14.1, since that's what we pull
in. He said he'd try again on Monday.
This commit is contained in:
Hixie
2016-02-26 18:23:11 -08:00
parent 93b11edc82
commit 2a13c4bc3d
4 changed files with 4 additions and 79 deletions

2
DEPS
View File

@@ -26,7 +26,7 @@ vars = {
# Note: When updating the Dart revision, ensure that all entries that are
# dependencies of dart are also updated
'dart_revision': 'e03a9d54c7b3bc913a5f2f10825e161f9e1e7988',
'dart_revision': '5322692506e0f1af4e5c83ea8ae994498342466a',
'dart_observatory_packages_revision': 'cf90eb9077177d3d6b3fd5e8289477c2385c026a',
'dart_root_certificates_revision': 'c3a41df63afacec62fcb8135196177e35fe72f71',

View File

@@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//mojo/public/dart/rules.gni")
import("//dart/sdk/lib/rules.gni")
copy("copy_sky_engine_license") {
sources = [
@@ -16,77 +15,14 @@ copy("copy_sky_engine_license") {
]
}
dart_sdk_lib_copy("async") {
sdk_lib_name = "async"
destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk"
}
dart_sdk_lib_copy("collection") {
sdk_lib_name = "collection"
destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk"
}
dart_sdk_lib_copy("convert") {
sdk_lib_name = "convert"
destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk"
}
dart_sdk_lib_copy("core") {
sdk_lib_name = "core"
destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk"
}
dart_sdk_lib_copy("developer") {
sdk_lib_name = "developer"
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"
}
dart_sdk_lib_copy("isolate") {
sdk_lib_name = "isolate"
destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk"
}
dart_sdk_lib_copy("math") {
sdk_lib_name = "math"
destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk"
}
dart_sdk_lib_copy("typed_data") {
sdk_lib_name = "typed_data"
destination = "$root_gen_dir/dart-pkg/sky_engine/dart_sdk"
}
group("copy_dart_sdk") {
deps = [
":async",
":collection",
":convert",
":core",
":developer",
":io",
":isolate",
":math",
":typed_data",
]
}
dart_pkg("sky_engine") {
sources = [
"dart_sdk/_empty.dart",
"lib/_embedder.yaml",
"README.md",
"pubspec.yaml",
]
deps = [
":copy_sky_engine_license",
":copy_dart_sdk",
"//sky/engine/bindings",
]
@@ -98,4 +34,7 @@ dart_pkg("sky_engine") {
"$service_isolate_dir/loader.dart",
"$service_isolate_dir/server.dart",
]
sdk_ext_mappings = [
"dart:ui,dart_ui.dart",
]
}

View File

@@ -1,14 +0,0 @@
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:jni": "../sdk_ext/dart_jni/jni.dart"
"dart:math": "../dart_sdk/math/math.dart"
"dart:typed_data": "../dart_sdk/typed_data/typed_data.dart"
"dart:ui": "../sdk_ext/dart_ui.dart"
"dart:_internal": "../dart_sdk/_empty.dart"
"dart:nativewrappers": "../dart_sdk/_empty.dart"