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

Support hot reload in corejit mode (#5866)

Browse Source 
Since frontend_server --incremental doesn't support --link-platform, instead of baking host app into the snapshot, load it from kernel file when running in debug mode.
This commit is contained in:
Stanislav Baranov 2018-07-26 08:52:19 -07:00 committed by GitHub
parent 66f87f4f4c
commit f480e32347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
shell/platform/android/platform_view_android_jni.cc
View File

@ -184,18 +184,26 @@ std::unique_ptr<IsolateConfiguration> CreateIsolateConfiguration(
const auto configuration_from_blob =
[&asset_manager](const std::string& snapshot_name)
-> std::unique_ptr<IsolateConfiguration> {
std::unique_ptr<fml::Mapping> blob =
asset_manager.GetAsMapping(snapshot_name);
auto blob = asset_manager.GetAsMapping(snapshot_name);
auto delta = asset_manager.GetAsMapping("kernel_delta.bin");
if (blob && delta) {
std::vector<std::unique_ptr<fml::Mapping>> kernels;
kernels.emplace_back(std::move(blob));
kernels.emplace_back(std::move(delta));
return IsolateConfiguration::CreateForKernelList(std::move(kernels));
}
if (blob) {
return IsolateConfiguration::CreateForSnapshot(std::move(blob));
}
if (delta) {
return IsolateConfiguration::CreateForSnapshot(std::move(delta));
}
return nullptr;
};
if (auto kernel = configuration_from_blob("kernel_blob.bin")) {
return kernel;
}
if (auto script = configuration_from_blob("snapshot_blob.bin")) {
return script;
}
@ -209,14 +217,13 @@ static void RunBundleAndSnapshot(
jobject jcaller,
jlong shell_holder,
jstring jbundlepath,
jstring /* snapshot override (unused) */,
jstring jsnapshotOverride,
jstring jEntrypoint,
jboolean /* reuse runtime controller (unused) */,
jobject jAssetManager) {
auto asset_manager = fml::MakeRefCounted<blink::AssetManager>();
const auto bundlepath = fml::jni::JavaStringToString(env, jbundlepath);
if (bundlepath.size() > 0) {
// If we got a bundle path, attempt to use that as a directory asset
// bundle or a zip asset bundle.
@ -244,8 +251,13 @@ static void RunBundleAndSnapshot(
}
}
auto isolate_configuration = CreateIsolateConfiguration(*asset_manager);
const auto defaultpath = fml::jni::JavaStringToString(env, jsnapshotOverride);
if (defaultpath.size() > 0) {
asset_manager->PushBack(std::make_unique<blink::DirectoryAssetBundle>(
fml::OpenFile(defaultpath.c_str(), fml::OpenPermission::kRead, true)));
}
auto isolate_configuration = CreateIsolateConfiguration(*asset_manager);
if (!isolate_configuration) {
FXL_DLOG(ERROR)
<< "Isolate configuration could not be determined for engine launch.";