Skip to content

Commit

Permalink
Removed Dartium SDK libs
Browse files Browse the repository at this point in the history 
First stage remove the libraries that are no longer part of 1.25 and beyond.

R=alanknight@google.com

Review-Url: https://codereview.chromium.org/3008563002 .
  • Loading branch information
@terrylucas
terrylucas committed Aug 29, 2017
1 parent 340957c commit a189084
Show file tree
Hide file tree
Showing 22 changed files with 34 additions and 120,879 deletions.
3 changes: 0 additions & 3 deletions pkg/analyzer/lib/src/summary/summary_file_builder.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ class SummaryBuilder {
//
Set<String> uriSet =
sdk.sdkLibraries.map((SdkLibrary library) => library.shortName).toSet();
if (!strong) {
uriSet.add('dart:html/nativewrappers.dart');
}
uriSet.add('dart:html_common/html_common_dart2js.dart');

Set<Source> librarySources = new HashSet<Source>();
Expand Down
48 changes: 16 additions & 32 deletions pkg/dev_compiler/tool/input_sdk/libraries.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,35 +61,27 @@ const Map<String, LibraryInfo> libraries = const {
categories: "Client,Server,Embedded",
maturity: Maturity.UNSTABLE,
dart2jsPatchPath: "_internal/js_runtime/lib/developer_patch.dart"),
"html": const LibraryInfo("html/dartium/html_dartium.dart",
categories: "Client",
maturity: Maturity.WEB_STABLE,
dart2jsPath: "html/dart2js/html_dart2js.dart"),
"html": const LibraryInfo("html/dart2js/html_dart2js.dart",
categories: "Client", maturity: Maturity.WEB_STABLE),
"html_common": const LibraryInfo("html/html_common/html_common.dart",
categories: "Client",
maturity: Maturity.WEB_STABLE,
dart2jsPath: "html/html_common/html_common_dart2js.dart",
documented: false,
implementation: true),
"indexed_db": const LibraryInfo("indexed_db/dartium/indexed_db_dartium.dart",
categories: "Client",
maturity: Maturity.WEB_STABLE,
dart2jsPath: "indexed_db/dart2js/indexed_db_dart2js.dart"),
"indexed_db": const LibraryInfo("indexed_db/dart2js/indexed_db_dart2js.dart",
categories: "Client", maturity: Maturity.WEB_STABLE),
"io": const LibraryInfo("io/io.dart",
categories: "Server",
dart2jsPatchPath: "_internal/js_runtime/lib/io_patch.dart"),
"isolate": const LibraryInfo("isolate/isolate.dart",
categories: "Client,Server",
maturity: Maturity.STABLE,
dart2jsPatchPath: "_internal/js_runtime/lib/isolate_patch.dart"),
"js": const LibraryInfo("js/dartium/js_dartium.dart",
categories: "Client",
maturity: Maturity.STABLE,
dart2jsPath: "js/dart2js/js_dart2js.dart"),
"js_util": const LibraryInfo("js_util/dartium/js_util_dartium.dart",
categories: "Client",
maturity: Maturity.STABLE,
dart2jsPath: "js_util/dart2js/js_util_dart2js.dart"),
"js": const LibraryInfo("js/dart2js/js_dart2js.dart",
categories: "Client", maturity: Maturity.STABLE),
"js_util": const LibraryInfo("js_util/dart2js/js_util_dart2js.dart",
categories: "Client", maturity: Maturity.STABLE),
"math": const LibraryInfo("math/math.dart",
categories: "Client,Server,Embedded",
maturity: Maturity.STABLE,
Expand All @@ -113,22 +105,14 @@ const Map<String, LibraryInfo> libraries = const {
implementation: true,
documented: false,
platforms: DART2JS_PLATFORM),
"svg": const LibraryInfo("svg/dartium/svg_dartium.dart",
categories: "Client",
maturity: Maturity.WEB_STABLE,
dart2jsPath: "svg/dart2js/svg_dart2js.dart"),
"web_audio": const LibraryInfo("web_audio/dartium/web_audio_dartium.dart",
categories: "Client",
maturity: Maturity.WEB_STABLE,
dart2jsPath: "web_audio/dart2js/web_audio_dart2js.dart"),
"web_gl": const LibraryInfo("web_gl/dartium/web_gl_dartium.dart",
categories: "Client",
maturity: Maturity.WEB_STABLE,
dart2jsPath: "web_gl/dart2js/web_gl_dart2js.dart"),
"web_sql": const LibraryInfo("web_sql/dartium/web_sql_dartium.dart",
categories: "Client",
maturity: Maturity.WEB_STABLE,
dart2jsPath: "web_sql/dart2js/web_sql_dart2js.dart"),
"svg": const LibraryInfo("svg/dart2js/svg_dart2js.dart.dart",
categories: "Client", maturity: Maturity.WEB_STABLE),
"web_audio": const LibraryInfo("web_audio/dart2js/web_audio_dart2js.dart",
categories: "Client", maturity: Maturity.WEB_STABLE),
"web_gl": const LibraryInfo("web_gl/dart2js/web_gl_dart2js.dart",
categories: "Client", maturity: Maturity.WEB_STABLE),
"web_sql": const LibraryInfo("web_sql/dart2js/web_sql_dart2js.dart",
categories: "Client", maturity: Maturity.WEB_STABLE),
"_internal": const LibraryInfo("internal/internal.dart",
categories: "",
documented: false,
Expand Down
122 changes: 0 additions & 122 deletions runtime/bin/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,21 +104,11 @@ gen_library_src_path("generate_io_patch_cc_file") {
output = "$target_gen_dir/io_patch_gen.cc"
}

gen_library_src_path("generate_html_cc_file") {
name = "html"
kind = "source"
sources = [
"../../sdk/lib/html/dartium/html_dartium.dart",
]
output = "$target_gen_dir/html_gen.cc"
}

gen_library_src_path("generate_html_common_cc_file") {
name = "html_common"
kind = "source"
sources = [
"../../sdk/lib/html/html_common/conversions.dart",
"../../sdk/lib/html/html_common/conversions_dartium.dart",
"../../sdk/lib/html/html_common/css_class_set.dart",
"../../sdk/lib/html/html_common/device.dart",
"../../sdk/lib/html/html_common/filtered_element_list.dart",
Expand All @@ -128,61 +118,6 @@ gen_library_src_path("generate_html_common_cc_file") {
output = "$target_gen_dir/html_common_gen.cc"
}

gen_library_src_path("generate_js_cc_file") {
name = "js"
kind = "source"
sources = [
"../../sdk/lib/js/dartium/js_dartium.dart",
]
output = "$target_gen_dir/js_gen.cc"
}

gen_library_src_path("generate_js_util_cc_file") {
name = "js_util"
kind = "source"
sources = [
"../../sdk/lib/js_util/dartium/js_util_dartium.dart",
]
output = "$target_gen_dir/js_util_gen.cc"
}

gen_library_src_path("generate_blink_cc_file") {
name = "_blink"
kind = "source"
sources = [
"../../sdk/lib/_blink/dartium/_blink_dartium.dart",
]
output = "$target_gen_dir/blink_gen.cc"
}

gen_library_src_path("generate_indexed_db_cc_file") {
name = "indexed_db"
kind = "source"
sources = [
"../../sdk/lib/indexed_db/dartium/indexed_db_dartium.dart",
]
output = "$target_gen_dir/indexed_db_gen.cc"
}

gen_library_src_path("generate_cached_patches_cc_file") {
name = "cached_patches"
library_name = "cached_patches.dart"
kind = "source"
sources = [
"../../sdk/lib/js/dartium/cached_patches.dart",
]
output = "$target_gen_dir/cached_patches_gen.cc"
}

gen_library_src_path("generate_web_gl_cc_file") {
name = "web_gl"
kind = "source"
sources = [
"../../sdk/lib/web_gl/dartium/web_gl_dartium.dart",
]
output = "$target_gen_dir/web_gl_gen.cc"
}

gen_library_src_path("generate_metadata_cc_file") {
name = "metadata"
library_name = "metadata.dart"
Expand All @@ -193,33 +128,6 @@ gen_library_src_path("generate_metadata_cc_file") {
output = "$target_gen_dir/metadata_gen.cc"
}

gen_library_src_path("generate_web_sql_cc_file") {
name = "web_sql"
kind = "source"
sources = [
"../../sdk/lib/web_sql/dartium/web_sql_dartium.dart",
]
output = "$target_gen_dir/web_sql_gen.cc"
}

gen_library_src_path("generate_svg_cc_file") {
name = "svg"
kind = "source"
sources = [
"../../sdk/lib/svg/dartium/svg_dartium.dart",
]
output = "$target_gen_dir/svg_gen.cc"
}

gen_library_src_path("generate_web_audio_cc_file") {
name = "web_audio"
kind = "source"
sources = [
"../../sdk/lib/web_audio/dartium/web_audio_dartium.dart",
]
output = "$target_gen_dir/web_audio_gen.cc"
}

config("libdart_builtin_config") {
if (!is_win) {
libs = [ "dl" ]
Expand All @@ -244,21 +152,11 @@ template("build_libdart_builtin") {
}
public_configs = [ ":libdart_builtin_config" ]
deps = [
":generate_blink_cc_file",
":generate_builtin_cc_file",
":generate_cached_patches_cc_file",
":generate_html_cc_file",
":generate_html_common_cc_file",
":generate_indexed_db_cc_file",
":generate_io_cc_file",
":generate_io_patch_cc_file",
":generate_js_cc_file",
":generate_js_util_cc_file",
":generate_metadata_cc_file",
":generate_svg_cc_file",
":generate_web_audio_cc_file",
":generate_web_gl_cc_file",
":generate_web_sql_cc_file",
]
include_dirs = [ ".." ]
set_sources_assignment_filter([
Expand Down Expand Up @@ -800,21 +698,11 @@ dart_executable("dart_bootstrap") {
]
extra_deps = [
":gen_resources_cc",
":generate_blink_cc_file",
":generate_builtin_cc_file",
":generate_cached_patches_cc_file",
":generate_html_cc_file",
":generate_html_common_cc_file",
":generate_indexed_db_cc_file",
":generate_io_cc_file",
":generate_io_patch_cc_file",
":generate_js_cc_file",
":generate_js_util_cc_file",
":generate_metadata_cc_file",
":generate_svg_cc_file",
":generate_web_audio_cc_file",
":generate_web_gl_cc_file",
":generate_web_sql_cc_file",
"..:libdart_nosnapshot_with_precompiler",
]
extra_defines = [ "NO_OBSERVATORY" ]
Expand All @@ -831,22 +719,12 @@ dart_executable("dart_bootstrap") {
"snapshot_empty.cc",

# Include generated source files.
"$target_gen_dir/blink_gen.cc",
"$target_gen_dir/builtin_gen.cc",
"$target_gen_dir/cached_patches_gen.cc",
"$target_gen_dir/html_common_gen.cc",
"$target_gen_dir/html_gen.cc",
"$target_gen_dir/indexed_db_gen.cc",
"$target_gen_dir/io_gen.cc",
"$target_gen_dir/io_patch_gen.cc",
"$target_gen_dir/js_gen.cc",
"$target_gen_dir/js_util_gen.cc",
"$target_gen_dir/metadata_gen.cc",
"$target_gen_dir/resources_gen.cc",
"$target_gen_dir/svg_gen.cc",
"$target_gen_dir/web_audio_gen.cc",
"$target_gen_dir/web_gl_gen.cc",
"$target_gen_dir/web_sql_gen.cc",
]
}

Expand Down
10 changes: 0 additions & 10 deletions runtime/bin/builtin.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,8 @@ Builtin::builtin_lib_props Builtin::builtin_libraries_[] = {

#if defined(DART_NO_SNAPSHOT)
// Only include these libraries in the dart_bootstrap case for now.
{"dart:html", html_source_paths_, NULL, NULL, true},
{"dart:html_common", html_common_source_paths_, NULL, NULL, true},
{"dart:js", js_source_paths_, NULL, NULL, true},
{"dart:js_util", js_util_source_paths_, NULL, NULL, true},
{"dart:_blink", _blink_source_paths_, NULL, NULL, true},
{"dart:indexed_db", indexed_db_source_paths_, NULL, NULL, true},
{"cached_patches.dart", cached_patches_source_paths_, NULL, NULL, true},
{"dart:web_gl", web_gl_source_paths_, NULL, NULL, true},
{"metadata.dart", metadata_source_paths_, NULL, NULL, true},
{"dart:web_sql", web_sql_source_paths_, NULL, NULL, true},
{"dart:svg", svg_source_paths_, NULL, NULL, true},
{"dart:web_audio", web_audio_source_paths_, NULL, NULL, true},
#endif // defined(DART_NO_SNAPSHOT)

// End marker.
Expand Down
10 changes: 0 additions & 10 deletions runtime/bin/builtin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,8 @@ class Builtin {
static const char* _builtin_source_paths_[];
static const char* io_source_paths_[];
static const char* io_patch_paths_[];
static const char* html_source_paths_[];
static const char* html_common_source_paths_[];
static const char* js_source_paths_[];
static const char* js_util_source_paths_[];
static const char* _blink_source_paths_[];
static const char* indexed_db_source_paths_[];
static const char* cached_patches_source_paths_[];
static const char* web_gl_source_paths_[];
static const char* metadata_source_paths_[];
static const char* web_sql_source_paths_[];
static const char* svg_source_paths_[];
static const char* web_audio_source_paths_[];

static Dart_Port load_port_;
static const int num_libs_;
Expand Down
2 changes: 1 addition & 1 deletion runtime/lib/mirrors.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ static RawInstance* CreateLibraryMirror(Thread* thread, const Library& lib) {
args.SetAt(1, str);
str = lib.url();
const char* censored_libraries[] = {
"dart:_builtin", "dart:_blink", "dart:_vmservice", NULL,
"dart:_builtin", "dart:_vmservice", NULL,
};
for (intptr_t i = 0; censored_libraries[i] != NULL; i++) {
if (str.Equals(censored_libraries[i])) {
Expand Down
9 changes: 0 additions & 9 deletions sdk/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,29 +177,20 @@ _platform_sdk_libraries = [
]

_full_sdk_libraries = [
"_blink",
"_chrome",
"_internal",
"async",
"collection",
"convert",
"core",
"developer",
"html",
"indexed_db",
"internal",
"io",
"isolate",
"js",
"js_util",
"math",
"mirrors",
"profiler",
"svg",
"typed_data",
"web_audio",
"web_gl",
"web_sql",
]

# Package sources copied to lib/
Expand Down
Loading

0 comments on commit a189084

Please sign in to comment.