Use aot-shared-library-name arg.

Author: dvc94ch

Cargo.lock

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 env_logger = "0.7.1"
-flutter-engine = { git = "https://github.com/flutter-rs/flutter-rs", features = ["loader"] }
+flutter-engine = { git = "https://github.com/flutter-rs/flutter-rs" }
 flutter-winit = { git = "https://github.com/flutter-rs/flutter-rs" }
 glutin = { git = "https://github.com/dvc94ch/glutin", branch = "android" }
 log = "0.4.8"

Cargo.toml

@@ -1,30 +1,26 @@
-use flutter_engine::loader::load_snapshot;
 use flutter_winit::FlutterWindow;
 use glutin::window::WindowBuilder;
-use std::path::PathBuf;
+use std::path::Path;
 
 fn main() {
     env_logger::init();
 
-    let asset_dir = std::env::var("FLUTTER_ASSET_DIR").expect("FLUTTER_ASSET_DIR");
+    let assets_dir = std::env::var("FLUTTER_ASSET_DIR")
+        .expect("FLUTTER_ASSET_DIR");
 
-    let (_lib, snapshot) = std::env::var("FLUTTER_AOT_SNAPSHOT")
-        .ok()
-        .map(|aot_path| {
-            unsafe { load_snapshot(&PathBuf::from(aot_path)) }
-                .ok()
-                .map(|(lib, snapshot)| (Some(lib), Some(snapshot)))
-                .unwrap_or_default()
-        })
-        .unwrap_or_default();
+    let mut args = Vec::with_capacity(1);
+
+    if let Some(snapshot) = std::env::var("FLUTTER_AOT_SNAPSHOT").ok() {
+        if Path::new(&snapshot).exists() {
+            args.push(format!("--aot-shared-library-name={}", snapshot));
+        }
+    }
 
     let window = WindowBuilder::new().with_title("Flutter App Demo");
     let flutter = FlutterWindow::new(window).unwrap();
     let flutter = flutter.with_resource_context().unwrap();
 
-    flutter
-        .start_engine(&PathBuf::from(asset_dir), &[], snapshot)
-        .unwrap();
+    flutter.start_engine(Path::new(&assets_dir), &args).unwrap();
 
     flutter.run();
 }