Skip to content

Commit

Permalink
Revert "Roll Dart to 1f4dfce (flutter#6515)" (flutter#6537)
Browse files Browse the repository at this point in the history
This reverts commit ba04499.
  • Loading branch information
rmacnak-google authored Oct 15, 2018
1 parent 964acaf commit 4ee7725
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 2 deletions.
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': '1f4dfce179c8f05c9e48759300a15e671b88cc10',
'dart_revision': 'b99bcfd3099f0d32e39287160a9539e878cb0b68',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand Down Expand Up @@ -126,7 +126,7 @@ deps = {
# and not have to specific specific hashes.

'src/third_party/tonic':
Var('fuchsia_git') + '/tonic' + '@' + 'dd971f40ba7646fab586ac2b6370721257109cb7',
Var('fuchsia_git') + '/tonic' + '@' + '187c6d54eb7ac604e6ae00577d8992ffdc34e52c',

'src/third_party/benchmark':
Var('fuchsia_git') + '/third_party/benchmark' + '@' + '21f1eb3fe269ea43eba862bf6b699cde46587ade',
Expand Down
36 changes: 36 additions & 0 deletions runtime/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,41 @@ import("//third_party/dart/runtime/bin/vmservice/vmservice_sources.gni")
import("$flutter_root/common/config.gni")
import("$flutter_root/testing/testing.gni")

action("gen_embedded_resources_cc") {
script = "//third_party/dart/runtime/tools/create_resources.py"
output_file = "$target_gen_dir/embedded_resources.cc"
outputs = [
output_file,
]

inputs = rebase_path(vmservice_sources,
"",
"//third_party/dart/runtime/bin/vmservice")

args = [
"--output",
rebase_path(output_file),
"--outer_namespace",
"flutter",
"--inner_namespace",
"runtime",
"--table_name",
"flutter_embedded_service_isolate",
"--root_prefix",
rebase_path("//third_party/dart/runtime/bin/"),
] + rebase_path(inputs)
}

source_set("embedded_resources_cc") {
sources = [
"$target_gen_dir/embedded_resources.cc",
]
deps = [
":gen_embedded_resources_cc",
]
public_configs = [ "$flutter_root:config" ]
}

source_set("test_font") {
sources = [
"test_font_data.cc",
Expand Down Expand Up @@ -49,6 +84,7 @@ source_set("runtime") {
]

deps = [
":embedded_resources_cc",
":test_font",
"$flutter_root/assets",
"$flutter_root/common",
Expand Down

0 comments on commit 4ee7725

Please sign in to comment.