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

mkustermann · web-flow · commit 81baff97c29b · 2018-08-15T17:45:11.000+02:00
diff --git a/shell/platform/android/flutter_main.cc b/shell/platform/android/flutter_main.cc
@@ -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"});
 
diff --git a/shell/platform/android/io/flutter/view/FlutterMain.java b/shell/platform/android/io/flutter/view/FlutterMain.java
@@ -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.
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
@@ -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) {
diff --git a/shell/platform/embedder/embedder.cc b/shell/platform/embedder/embedder.cc
@@ -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)) {
