DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move embedded resources to //flutter/runtime (flutter/engine#2921)

Browse Source 
This data is actually used in //flutter/runtime, so it makes more sense to
generate it and include it in the build from there.
This commit is contained in:
Adam Barth 2016-08-12 16:54:00 -07:00 committed by GitHub
parent 6598d2104d
commit d03e8fa34b
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engine/src/flutter/runtime/BUILD.gn
View File

@ -2,6 +2,28 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//mojo/dart/embedder/embedder.gni")
vmservice_sources_gypi =
exec_script("//build/gypi_to_gn.py",
[ rebase_path("//dart/runtime/bin/vmservice/vmservice_sources.gypi") ],
"scope",
[ rebase_path("//dart/runtime/bin/vmservice/vmservice_sources.gypi") ])
dart_embedder_resources("gen_embedded_resources_cc") {
inputs = rebase_path(vmservice_sources_gypi.sources,
"",
"//dart/runtime/bin/vmservice")
root_prefix = "//dart/runtime/bin/"
output = "$target_gen_dir/embedded_resources.cc"
table_name = "flutter_embedded_service_isolate"
}
source_set("embedded_resources_cc") {
sources = [ "$target_gen_dir/embedded_resources.cc" ]
deps = [ ":gen_embedded_resources_cc" ]
}
source_set("runtime") {
sources = [
"dart_controller.cc",
@ -21,6 +43,7 @@ source_set("runtime") {
]
deps = [
":embedded_resources_cc",
"//dart/runtime:libdart",
"//dart/runtime/bin:embedded_dart_io",
"//flutter/assets",

4
engine/src/flutter/runtime/dart_service_isolate.cc
View File

@ -31,7 +31,7 @@ static const char* kServiceIsolateScript = "vmservice_io.dart";
namespace mojo {
namespace dart {
extern ResourcesEntry __sky_embedder_service_isolate_resources_[];
extern ResourcesEntry __flutter_embedded_service_isolate_resources_[];
}
}
@ -104,7 +104,7 @@ bool DartServiceIsolate::Startup(std::string server_ip,
if (!g_resources) {
g_resources = new EmbedderResources(
&mojo::dart::__sky_embedder_service_isolate_resources_[0]);
&mojo::dart::__flutter_embedded_service_isolate_resources_[0]);
}
Dart_Handle result;