Skip to content

Commit

Permalink
Switch flutter's dart sdk to full and add dartdevc libraries (flutter…
Browse files Browse the repository at this point in the history
  • Loading branch information
jonahwilliams authored Feb 26, 2019
1 parent fb1c543 commit e32531f
Show file tree
Hide file tree
Showing 4 changed files with 272 additions and 1 deletion.
38 changes: 37 additions & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("$flutter_root/common/config.gni")
import("//third_party/dart/build/dart/dart_action.gni")

# Temporary snapshot copy rules until we can use the full SDK.
_flutter_sdk_snapshots = [
Expand Down Expand Up @@ -36,7 +37,8 @@ group("flutter") {
"$flutter_root/frontend_server",
"//third_party/dart:create_sdk",
"$flutter_root/lib/stub_ui:stub_ui",
":dart2js_platform_files"
":dart2js_platform_files",
":flutter_dartdevc_kernel_sdk",
]
foreach(snapshot, _flutter_sdk_snapshots) {
public_deps += [ ":copy_flutter_${snapshot[0]}_snapshot" ]
Expand Down Expand Up @@ -108,3 +110,37 @@ copy("dart2js_platform_files") {
"$root_out_dir/flutter_patched_sdk/{{source_file_part}}",
]
}


prebuilt_dart_action("flutter_dartdevc_kernel_sdk") {
deps = [
"//third_party/dart:create_sdk",
]

packages = "//third_party/dart/.packages"

script = "//third_party/dart/pkg/dev_compiler/tool/kernel_sdk.dart"

inputs = [
"//third_party/dart/pkg/dev_compiler/tool/kernel_sdk.dart",
]

outputs = [
"$target_gen_dir/kernel/amd/dart_sdk.js",
"$target_gen_dir/kernel/amd/dart_sdk.js.map",
"$target_gen_dir/kernel/common/dart_sdk.js",
"$target_gen_dir/kernel/common/dart_sdk.js.map",
"$target_gen_dir/kernel/es6/dart_sdk.js",
"$target_gen_dir/kernel/es6/dart_sdk.js.map",
"$target_gen_dir/kernel/legacy/dart_sdk.js",
"$target_gen_dir/kernel/legacy/dart_sdk.js.map",
]

libraries_path = rebase_path("$flutter_root/lib/snapshot/libraries.json")
output_path = rebase_path("$target_gen_dir/kernel/flutter_ddc_sdk.dill")

args = [
"--output=$output_path",
"--libraries=$libraries_path",
]
}
117 changes: 117 additions & 0 deletions lib/snapshot/libraries.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,123 @@
{
"comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.",
"comment:1": "Instead modify 'flutter/lib/snapshot/libraries.yaml' and follow the instructions therein.",
"none": {
"libraries": {}
},
"dartdevc": {
"libraries": {
"async": {
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/async_patch.dart",
"uri": "../../../third_party/dart/sdk/lib/async/async.dart"
},
"_runtime": {
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/runtime.dart"
},
"_interceptors": {
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/interceptors.dart"
},
"mirrors": {
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/mirrors_patch.dart",
"supported": false,
"uri": "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart"
},
"_debugger": {
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/debugger.dart"
},
"io": {
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/io_patch.dart",
"supported": false,
"uri": "../../../third_party/dart/sdk/lib/io/io.dart"
},
"_internal": {
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/internal_patch.dart",
"uri": "../../../third_party/dart/sdk/lib/internal/internal.dart"
},
"_metadata": {
"uri": "../../../third_party/dart/sdk/lib/html/html_common/metadata.dart"
},
"_http": {
"uri": "../../../third_party/dart/sdk/lib/_http/http.dart"
},
"_js_primitives": {
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_primitives.dart"
},
"_js_helper": {
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_helper.dart"
},
"ui": {
"uri": "flutter/lib/stub_ui/ui.dart"
},
"js": {
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js/dart2js/js_dart2js.dart"
},
"_js_mirrors": {
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_mirrors.dart"
},
"html_common": {
"uri": "../../../third_party/dart/sdk/lib/html/html_common/html_common_dart2js.dart"
},
"_native_typed_data": {
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/native_typed_data.dart"
},
"core": {
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/core_patch.dart",
"uri": "../../../third_party/dart/sdk/lib/core/core.dart"
},
"js_util": {
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js_util/dart2js/js_util_dart2js.dart"
},
"collection": {
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/collection_patch.dart",
"uri": "../../../third_party/dart/sdk/lib/collection/collection.dart"
},
"typed_data": {
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/typed_data_patch.dart",
"uri": "../../../third_party/dart/sdk/lib/typed_data/typed_data.dart"
},
"web_audio": {
"uri": "../../../third_party/dart/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"
},
"html": {
"uri": "../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart"
},
"developer": {
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/developer_patch.dart",
"uri": "../../../third_party/dart/sdk/lib/developer/developer.dart"
},
"isolate": {
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/isolate_patch.dart",
"supported": false,
"uri": "../../../third_party/dart/sdk/lib/isolate/isolate.dart"
},
"web_gl": {
"uri": "../../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"
},
"indexed_db": {
"uri": "../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"
},
"convert": {
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/convert_patch.dart",
"uri": "../../../third_party/dart/sdk/lib/convert/convert.dart"
},
"_isolate_helper": {
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/isolate_helper.dart"
},
"math": {
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/math_patch.dart",
"uri": "../../../third_party/dart/sdk/lib/math/math.dart"
},
"_foreign_helper": {
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/foreign_helper.dart"
},
"web_sql": {
"uri": "../../../third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"
},
"svg": {
"uri": "../../../third_party/dart/sdk/lib/svg/dart2js/svg_dart2js.dart"
}
}
},
"flutter": {
"libraries": {
"_builtin": {
Expand Down
115 changes: 115 additions & 0 deletions lib/snapshot/libraries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
# changing libraries, sources, and patch files. See
# https://github.com/dart-lang/sdk/issues/28836.

none:
libraries: {}

flutter:
libraries:
_builtin:
Expand Down Expand Up @@ -147,3 +150,115 @@ flutter:

vmservice_io:
uri: "../../../third_party/dart/runtime/bin/vmservice/vmservice_io.dart"

dartdevc:
libraries:
_runtime:
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/runtime.dart"

_debugger:
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/debugger.dart"

_foreign_helper:
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/foreign_helper.dart"

_http:
uri: "../../../third_party/dart/sdk/lib/_http/http.dart"

_interceptors:
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/interceptors.dart"

_internal:
uri: "../../../third_party/dart/sdk/lib/internal/internal.dart"
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/internal_patch.dart"

_isolate_helper:
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/isolate_helper.dart"

_js_helper:
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_helper.dart"

_js_mirrors:
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_mirrors.dart"

_js_primitives:
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_primitives.dart"

_metadata:
uri: "../../../third_party/dart/sdk/lib/html/html_common/metadata.dart"

_native_typed_data:
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/native_typed_data.dart"

async:
uri: "../../../third_party/dart/sdk/lib/async/async.dart"
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/async_patch.dart"

collection:
uri: "../../../third_party/dart/sdk/lib/collection/collection.dart"
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/collection_patch.dart"

convert:
uri: "../../../third_party/dart/sdk/lib/convert/convert.dart"
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/convert_patch.dart"

core:
uri: "../../../third_party/dart/sdk/lib/core/core.dart"
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/core_patch.dart"

developer:
uri: "../../../third_party/dart/sdk/lib/developer/developer.dart"
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/developer_patch.dart"

io:
uri: "../../../third_party/dart/sdk/lib/io/io.dart"
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/io_patch.dart"
supported: false

isolate:
uri: "../../../third_party/dart/sdk/lib/isolate/isolate.dart"
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/isolate_patch.dart"
supported: false

mirrors:
uri: "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart"
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/mirrors_patch.dart"
supported: false

math:
uri: "../../../third_party/dart/sdk/lib/math/math.dart"
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/math_patch.dart"

typed_data:
uri: "../../../third_party/dart/sdk/lib/typed_data/typed_data.dart"
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/typed_data_patch.dart"

html:
uri: "../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart"

html_common:
uri: "../../../third_party/dart/sdk/lib/html/html_common/html_common_dart2js.dart"

indexed_db:
uri: "../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"

js:
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js/dart2js/js_dart2js.dart"

js_util:
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js_util/dart2js/js_util_dart2js.dart"

svg:
uri: "../../../third_party/dart/sdk/lib/svg/dart2js/svg_dart2js.dart"

web_audio:
uri: "../../../third_party/dart/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"

web_gl:
uri: "../../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"

web_sql:
uri: "../../../third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"

ui:
uri: "flutter/lib/stub_ui/ui.dart"
3 changes: 3 additions & 0 deletions tools/gn
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@ def to_gn_args(args):
if args.arm_float_abi:
gn_args['arm_float_abi'] = args.arm_float_abi

# Switch flutter to full Dart SDK.
gn_args['dart_platform_sdk'] = False

return gn_args

def parse_args(args):
Expand Down

0 comments on commit e32531f

Please sign in to comment.