Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Switch all embedders to use platform_strong.dill instead of platform.dill (the flutter_tester binary already does this) #6024

Merged
mkustermann merged 1 commit into from
Aug 15, 2018
Merged

Switch all embedders to use platform_strong.dill instead of platform.dill (the flutter_tester binary already does this) #6024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shell/platform/android/flutter_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void FlutterMain::Init(JNIEnv* env,
// Check to see if the appropriate kernel files are present and configure
// settings accordingly.
auto platform_kernel_path =
fml::paths::JoinPaths({settings.assets_path, "platform.dill"});
fml::paths::JoinPaths({settings.assets_path, "platform_strong.dill"});
auto application_kernel_path =
fml::paths::JoinPaths({settings.assets_path, "kernel_blob.bin"});

Expand Down
2 changes: 1 addition & 1 deletion shell/platform/android/io/flutter/view/FlutterMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public class FlutterMain {
private static final String DEFAULT_FLX = "app.flx";
private static final String DEFAULT_SNAPSHOT_BLOB = "snapshot_blob.bin";
private static final String DEFAULT_KERNEL_BLOB = "kernel_blob.bin";
private static final String DEFAULT_PLATFORM_DILL = "platform.dill";
private static final String DEFAULT_PLATFORM_DILL = "platform_strong.dill";
private static final String DEFAULT_FLUTTER_ASSETS_DIR = "flutter_assets";

// Assets that are shared among all Flutter apps within an APK.
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"

static const char* kScriptSnapshotFileName = "snapshot_blob.bin";
static const char* kVMKernelSnapshotFileName = "platform.dill";
static const char* kVMKernelSnapshotFileName = "platform_strong.dill";
static const char* kApplicationKernelSnapshotFileName = "kernel_blob.bin";

static blink::Settings DefaultSettingsForProcess(NSBundle* bundle = nil) {
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/embedder/embedder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ FlutterResult FlutterEngineRun(size_t version,
// Check whether the assets path contains Dart 2 kernel assets.
const std::string kApplicationKernelSnapshotFileName = "kernel_blob.bin";
std::string platform_kernel_path =
fml::paths::JoinPaths({settings.assets_path, "platform.dill"});
fml::paths::JoinPaths({settings.assets_path, "platform_strong.dill"});
std::string application_kernel_path = fml::paths::JoinPaths(
{settings.assets_path, kApplicationKernelSnapshotFileName});
if (fml::IsFile(application_kernel_path)) {
Expand Down