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

[embedder] Avoid looking for the kernel binary in AOT builds. (#7577)

Browse Source
This commit is contained in:
Chinmay Garde 2019-01-24 14:22:39 -08:00 committed by GitHub
parent 1dc01adfa6
commit 0dedb56d2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
shell/platform/embedder/embedder.cc
View File

@ -342,14 +342,18 @@ FlutterResult FlutterEngineRun(size_t version,
settings.icu_data_path = icu_data_path;
settings.assets_path = args->assets_path;
// Verify the assets path contains Dart 2 kernel assets.
const std::string kApplicationKernelSnapshotFileName = "kernel_blob.bin";
std::string application_kernel_path = fml::paths::JoinPaths(
{settings.assets_path, kApplicationKernelSnapshotFileName});
if (!fml::IsFile(application_kernel_path)) {
return kInvalidArguments;
if (!blink::DartVM::IsRunningPrecompiledCode()) {
// Verify the assets path contains Dart 2 kernel assets.
const std::string kApplicationKernelSnapshotFileName = "kernel_blob.bin";
std::string application_kernel_path = fml::paths::JoinPaths(
{settings.assets_path, kApplicationKernelSnapshotFileName});
if (!fml::IsFile(application_kernel_path)) {
FML_LOG(ERROR) << "Not running in AOT mode but could not resolve the "
"kernel binary.";
return kInvalidArguments;
}
settings.application_kernel_asset = kApplicationKernelSnapshotFileName;
}
settings.application_kernel_asset = kApplicationKernelSnapshotFileName;
settings.task_observer_add = [](intptr_t key, fml::closure callback) {
fml::MessageLoop::GetCurrent().AddTaskObserver(key, std::move(callback));