flutter · auto-submit · Jun 1, 2026 · May 23, 2026
diff --git a/dev/devicelab/bin/tasks/build_ios_framework_module_test.dart b/dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
@@ -144,7 +144,7 @@ Future<void> _testBuildIosFramework(Directory projectDir, {bool isModule = false
 
   final String aotSymbols = await dumpSymbolTable(debugAppFrameworkPath);
 
-  if (aotSymbols.contains('architecture') || aotSymbols.contains('_kDartVmSnapshot')) {
+  if (aotSymbols.contains('architecture') || aotSymbols.contains('_kDartSnapshot')) {
     throw TaskResult.failure('Debug App.framework contains AOT');
   }
 
@@ -164,7 +164,7 @@ Future<void> _testBuildIosFramework(Directory projectDir, {bool isModule = false
 
     final String aotSymbols = await dumpSymbolTable(appFrameworkPath);
 
-    if (!aotSymbols.contains('_kDartVmSnapshot')) {
+    if (!aotSymbols.contains('_kDartSnapshot')) {
       throw TaskResult.failure('$mode App.framework missing Dart AOT');
     }
 
@@ -551,7 +551,7 @@ Future<void> _testBuildMacOSFramework(Directory projectDir) async {
 
   final String aotSymbols = await dumpSymbolTable(debugAppFrameworkPath);
 
-  if (aotSymbols.contains('architecture') || aotSymbols.contains('_kDartVmSnapshot')) {
+  if (aotSymbols.contains('architecture') || aotSymbols.contains('_kDartSnapshot')) {
     throw TaskResult.failure('Debug App.framework contains AOT');
   }
 
@@ -571,7 +571,7 @@ Future<void> _testBuildMacOSFramework(Directory projectDir) async {
 
     final String aotSymbols = await dumpSymbolTable(appFrameworkPath);
 
-    if (!aotSymbols.contains('_kDartVmSnapshot')) {
+    if (!aotSymbols.contains('_kDartSnapshot')) {
       throw TaskResult.failure('$mode App.framework missing Dart AOT');
     }
 

diff --git a/dev/devicelab/bin/tasks/module_test_ios.dart b/dev/devicelab/bin/tasks/module_test_ios.dart
@@ -671,7 +671,7 @@ Future<bool> _isAppAotBuild(Directory app) async {
 
   final String symbolTable = await dumpSymbolTable(binary);
 
-  return symbolTable.contains('kDartIsolateSnapshotInstructions');
+  return symbolTable.contains('kDartSnapshotText');
 }
 
 Future<void> _createFakeDartPlugin(String name, Directory parent) async {

diff --git a/engine/src/build/compiled_action.gni b/engine/src/build/compiled_action.gni
@@ -124,6 +124,9 @@ template("compiled_action") {
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
+    if (defined(invoker.public_deps)) {
+      public_deps = invoker.public_deps
+    }
     if (defined(invoker.depfile)) {
       depfile = invoker.depfile
     }

diff --git a/engine/src/flutter/build/dart/internal/flutter_snapshot.gni b/engine/src/flutter/build/dart/internal/flutter_snapshot.gni
@@ -134,12 +134,9 @@ template("flutter_snapshot") {
         isolate_snapshot_instructions,
       ]
       args += [
-        "--snapshot_kind=app-jit",
-        "--load_vm_snapshot_data=" + rebase_path(vm_snapshot_data),
-        "--load_isolate_snapshot_data=" + rebase_path(snapshot_data),
-        "--isolate_snapshot_data=" + rebase_path(isolate_snapshot_data),
-        "--isolate_snapshot_instructions=" +
-            rebase_path(isolate_snapshot_instructions),
+        "--snapshot_kind=app",
+        "--snapshot_data=" + rebase_path(isolate_snapshot_data),
+        "--snapshot_text=" + rebase_path(isolate_snapshot_instructions),
       ]
     }
 

diff --git a/engine/src/flutter/common/exported_symbols.sym b/engine/src/flutter/common/exported_symbols.sym
@@ -1,10 +1,8 @@
 # These symbols are looked up from within the executable at runtime and must
 # be exported in the dynamic symbol table.
 {
-  kDartVmSnapshotData;
-  kDartVmSnapshotInstructions;
-  kDartIsolateSnapshotData;
-  kDartIsolateSnapshotInstructions;
+  kDartSnapshotData;
+  kDartSnapshotText;
   InternalFlutterGpu*;
   kInternalFlutterGpu*;
 };
diff --git a/engine/src/flutter/common/exported_symbols_mac.sym b/engine/src/flutter/common/exported_symbols_mac.sym
@@ -1,8 +1,6 @@
 # These symbols are looked up from within the executable at runtime and must
 # be exported in the dynamic symbol table.
-_kDartVmSnapshotData
-_kDartVmSnapshotInstructions
-_kDartIsolateSnapshotData
-_kDartIsolateSnapshotInstructions
+_kDartSnapshotData
+_kDartSnapshotText
 _InternalFlutterGpu*
 _kInternalFlutterGpu*
diff --git a/engine/src/flutter/common/exported_test_symbols.sym b/engine/src/flutter/common/exported_test_symbols.sym
@@ -1,10 +1,8 @@
 # These symbols are looked up from within the executable at runtime and must
 # be exported in the dynamic symbol table.
 {
-  kDartVmSnapshotData;
-  kDartVmSnapshotInstructions;
-  kDartIsolateSnapshotData;
-  kDartIsolateSnapshotInstructions;
+  kDartSnapshotData;
+  kDartSnapshotText;
   InternalFlutterGpu*;
   kInternalFlutterGpu*;
   Spawn;

diff --git a/engine/src/flutter/common/exported_test_symbols_mac.sym b/engine/src/flutter/common/exported_test_symbols_mac.sym
@@ -1,9 +1,7 @@
 # These symbols are looked up from within the executable at runtime and must
 # be exported in the dynamic symbol table.
-_kDartVmSnapshotData
-_kDartVmSnapshotInstructions
-_kDartIsolateSnapshotData
-_kDartIsolateSnapshotInstructions
+_kDartSnapshotData
+_kDartSnapshotText
 _InternalFlutterGpu*
 _kInternalFlutterGpu*
 _Spawn

diff --git a/engine/src/flutter/lib/snapshot/BUILD.gn b/engine/src/flutter/lib/snapshot/BUILD.gn
@@ -53,6 +53,15 @@ group("generate_snapshot_bins") {
   }
 }
 
+generated_file("vm_isolate_snapshot_data") {
+  contents = ""
+  outputs = [ "$target_gen_dir/vm_isolate_snapshot.bin" ]
+}
+generated_file("vm_isolate_snapshot_instructions") {
+  contents = ""
+  outputs = [ "$target_gen_dir/vm_snapshot_instructions.bin" ]
+}
+
 # Compiles a binary snapshot of the core Dart/Flutter platform.
 #
 # Inputs:
@@ -84,27 +93,24 @@ compiled_action("generate_snapshot_bin") {
 
   inputs = [ platform_kernel ]
   deps = [ ":kernel_platform_files" ]
+  public_deps = [
+    ":vm_isolate_snapshot_data",
+    ":vm_isolate_snapshot_instructions",
+  ]
 
-  vm_snapshot_data = "$target_gen_dir/vm_isolate_snapshot.bin"
-  vm_snapshot_instructions = "$target_gen_dir/vm_snapshot_instructions.bin"
   isolate_snapshot_data = "$target_gen_dir/isolate_snapshot.bin"
   isolate_snapshot_instructions =
       "$target_gen_dir/isolate_snapshot_instructions.bin"
   outputs = [
-    vm_snapshot_data,
-    vm_snapshot_instructions,
     isolate_snapshot_data,
     isolate_snapshot_instructions,
   ]
 
   args = [
     "--snapshot_kind=core",
     "--enable_mirrors=false",
-    "--vm_snapshot_data=" + rebase_path(vm_snapshot_data),
-    "--vm_snapshot_instructions=" + rebase_path(vm_snapshot_instructions),
-    "--isolate_snapshot_data=" + rebase_path(isolate_snapshot_data),
-    "--isolate_snapshot_instructions=" +
-        rebase_path(isolate_snapshot_instructions),
+    "--snapshot_data=" + rebase_path(isolate_snapshot_data),
+    "--snapshot_text=" + rebase_path(isolate_snapshot_instructions),
   ]
 
   if (is_debug && flutter_runtime_mode != "profile" &&
@@ -120,31 +126,17 @@ compiled_action("generate_snapshot_bin") {
   }
 }
 
-bin_to_linkable("vm_snapshot_data_linkable") {
-  deps = [ ":generate_snapshot_bin" ]
-  input = "$target_gen_dir/vm_isolate_snapshot.bin"
-  symbol = "kDartVmSnapshotData"
-  executable = false
-}
-
-bin_to_linkable("vm_snapshot_instructions_linkable") {
-  deps = [ ":generate_snapshot_bin" ]
-  input = "$target_gen_dir/vm_snapshot_instructions.bin"
-  symbol = "kDartVmSnapshotInstructions"
-  executable = true
-}
-
 bin_to_linkable("isolate_snapshot_data_linkable") {
   deps = [ ":generate_snapshot_bin" ]
   input = "$target_gen_dir/isolate_snapshot.bin"
-  symbol = "kDartIsolateSnapshotData"
+  symbol = "kDartSnapshotData"
   executable = false
 }
 
 bin_to_linkable("isolate_snapshot_instructions_linkable") {
   deps = [ ":generate_snapshot_bin" ]
   input = "$target_gen_dir/isolate_snapshot_instructions.bin"
-  symbol = "kDartIsolateSnapshotInstructions"
+  symbol = "kDartSnapshotText"
   executable = true
 }
 
@@ -264,14 +256,10 @@ source_set("snapshot") {
     ":isolate_snapshot_data_linkable",
     ":isolate_snapshot_instructions_linkable",
     ":platform_strong_dill_linkable",
-    ":vm_snapshot_data_linkable",
-    ":vm_snapshot_instructions_linkable",
   ]
 
   sources = get_target_outputs(":isolate_snapshot_data_linkable") +
             get_target_outputs(":isolate_snapshot_instructions_linkable") +
-            get_target_outputs(":vm_snapshot_data_linkable") +
-            get_target_outputs(":vm_snapshot_instructions_linkable") +
             get_target_outputs(":platform_strong_dill_linkable")
 }
 

diff --git a/engine/src/flutter/lib/snapshot/snapshot.h b/engine/src/flutter/lib/snapshot/snapshot.h
@@ -10,10 +10,8 @@
 #include <stdint.h>
 
 extern "C" {
-extern const uint8_t kDartVmSnapshotData[];
-extern const uint8_t kDartVmSnapshotInstructions[];
-extern const uint8_t kDartIsolateSnapshotData[];
-extern const uint8_t kDartIsolateSnapshotInstructions[];
+extern const uint8_t kDartSnapshotData[];
+extern const uint8_t kDartSnapshotText[];
 }
 
 #endif  // FLUTTER_LIB_SNAPSHOT_SNAPSHOT_H_
diff --git a/engine/src/flutter/runtime/dart_snapshot.cc b/engine/src/flutter/runtime/dart_snapshot.cc
@@ -15,11 +15,10 @@
 
 namespace flutter {
 
-const char* DartSnapshot::kVMDataSymbol = "kDartVmSnapshotData";
-const char* DartSnapshot::kVMInstructionsSymbol = "kDartVmSnapshotInstructions";
-const char* DartSnapshot::kIsolateDataSymbol = "kDartIsolateSnapshotData";
-const char* DartSnapshot::kIsolateInstructionsSymbol =
-    "kDartIsolateSnapshotInstructions";
+const char* DartSnapshot::kVMDataSymbol = "kDartSnapshotData";
+const char* DartSnapshot::kVMInstructionsSymbol = "kDartSnapshotText";
+const char* DartSnapshot::kIsolateDataSymbol = "kDartSnapshotData";
+const char* DartSnapshot::kIsolateInstructionsSymbol = "kDartSnapshotText";
 
 // On Windows and Android (in debug mode) the engine finds the Dart snapshot
 // data through symbols that are statically linked into the executable.
@@ -102,7 +101,7 @@ static std::shared_ptr<const fml::Mapping> SearchMapping(
 static std::shared_ptr<const fml::Mapping> ResolveVMData(
     const Settings& settings) {
 #if DART_SNAPSHOT_STATIC_LINK
-  return std::make_unique<fml::NonOwnedMapping>(kDartVmSnapshotData,
+  return std::make_unique<fml::NonOwnedMapping>(kDartSnapshotData,
                                                 0,        // size
                                                 nullptr,  // release_func
                                                 true      // dontneed_safe
@@ -121,7 +120,7 @@ static std::shared_ptr<const fml::Mapping> ResolveVMData(
 static std::shared_ptr<const fml::Mapping> ResolveVMInstructions(
     const Settings& settings) {
 #if DART_SNAPSHOT_STATIC_LINK
-  return std::make_unique<fml::NonOwnedMapping>(kDartVmSnapshotInstructions,
+  return std::make_unique<fml::NonOwnedMapping>(kDartSnapshotText,
                                                 0,        // size
                                                 nullptr,  // release_func
                                                 true      // dontneed_safe
@@ -140,7 +139,7 @@ static std::shared_ptr<const fml::Mapping> ResolveVMInstructions(
 static std::shared_ptr<const fml::Mapping> ResolveIsolateData(
     const Settings& settings) {
 #if DART_SNAPSHOT_STATIC_LINK
-  return std::make_unique<fml::NonOwnedMapping>(kDartIsolateSnapshotData,
+  return std::make_unique<fml::NonOwnedMapping>(kDartSnapshotData,
                                                 0,        // size
                                                 nullptr,  // release_func
                                                 true      // dontneed_safe
@@ -159,11 +158,10 @@ static std::shared_ptr<const fml::Mapping> ResolveIsolateData(
 static std::shared_ptr<const fml::Mapping> ResolveIsolateInstructions(
     const Settings& settings) {
 #if DART_SNAPSHOT_STATIC_LINK
-  return std::make_unique<fml::NonOwnedMapping>(
-      kDartIsolateSnapshotInstructions,
-      0,        // size
-      nullptr,  // release_func
-      true      // dontneed_safe
+  return std::make_unique<fml::NonOwnedMapping>(kDartSnapshotText,
+                                                0,        // size
+                                                nullptr,  // release_func
+                                                true      // dontneed_safe
   );
 #else   // DART_SNAPSHOT_STATIC_LINK
   return SearchMapping(

diff --git a/engine/src/flutter/runtime/dart_vm.cc b/engine/src/flutter/runtime/dart_vm.cc
@@ -445,9 +445,6 @@ DartVM::DartVM(const std::shared_ptr<const DartVMData>& vm_data,
     TRACE_EVENT0("flutter", "Dart_Initialize");
     Dart_InitializeParams params = {};
     params.version = DART_INITIALIZE_PARAMS_CURRENT_VERSION;
-    params.vm_snapshot_data = vm_data_->GetVMSnapshot().GetDataMapping();
-    params.vm_snapshot_instructions =
-        vm_data_->GetVMSnapshot().GetInstructionsMapping();
     params.create_group = reinterpret_cast<decltype(params.create_group)>(
         DartIsolate::DartIsolateGroupCreateCallback);
     params.initialize_isolate =

diff --git a/engine/src/flutter/shell/platform/embedder/embedder.cc b/engine/src/flutter/shell/platform/embedder/embedder.cc
@@ -1739,15 +1739,17 @@ FlutterEngineResult FlutterEngineCreateAOTData(
       // Dart doesn't implement Dart_LoadELF on Fuchsia
       Dart_LoadedElf* loaded_elf = nullptr;
 #else
-      Dart_LoadedElf* loaded_elf = Dart_LoadELF(
-          source->elf_path,               // file path
-          0,                              // file offset
-          &error,                         // error (out)
-          &aot_data->vm_snapshot_data,    // vm snapshot data (out)
-          &aot_data->vm_snapshot_instrs,  // vm snapshot instr (out)
-          &aot_data->vm_isolate_data,     // vm isolate data (out)
-          &aot_data->vm_isolate_instrs    // vm isolate instr (out)
-      );
+      Dart_LoadedElf* loaded_elf =
+          Dart_LoadELF2(source->elf_path,             // file path
+                        0,                            // file offset
+                        &error,                       // error (out)
+                        &aot_data->vm_isolate_data,   // vm isolate data (out)
+                        &aot_data->vm_isolate_instrs  // vm isolate instr (out)
+          );
+      if (loaded_elf != nullptr) {
+        aot_data->vm_snapshot_data = aot_data->vm_isolate_data;
+        aot_data->vm_snapshot_instrs = aot_data->vm_isolate_instrs;
+      }
 #endif
 
       if (loaded_elf == nullptr) {

diff --git a/engine/src/flutter/shell/platform/embedder/embedder_exports.lst b/engine/src/flutter/shell/platform/embedder/embedder_exports.lst
@@ -9,10 +9,8 @@
     Flutter*;
     __Flutter*;
     kFlutter*;
-    kDartIsolateSnapshotData;
-    kDartIsolateSnapshotInstructions;
-    kDartVmSnapshotData;
-    kDartVmSnapshotInstructions;
+    kDartSnapshotData;
+    kDartSnapshotText;
     InternalFlutterGpu*;
     kInternalFlutterGpu*;
   local:

diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/dart_runner/BUILD.gn
@@ -139,7 +139,6 @@ runner("dart_aot_runner_bin") {
   extra_deps = [
     "$dart_src/runtime:libdart_aotruntime",
     "$dart_src/runtime/platform:libdart_platform_aotruntime",
-    "embedder:dart_aot_snapshot_cc",
   ]
 }
 
@@ -153,7 +152,6 @@ runner("dart_aot_product_runner_bin") {
   extra_deps = [
     "$dart_src/runtime:libdart_aotruntime",
     "$dart_src/runtime/platform:libdart_platform_aotruntime",
-    "embedder:dart_aot_product_snapshot_cc",
   ]
 }
 

diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_runner.cc b/engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_runner.cc
@@ -27,11 +27,6 @@
 #include "third_party/tonic/dart_microtask_queue.h"
 #include "third_party/tonic/dart_state.h"
 
-#if defined(AOT_RUNTIME)
-extern "C" uint8_t _kDartVmSnapshotData[];
-extern "C" uint8_t _kDartVmSnapshotInstructions[];
-#endif
-
 namespace dart_runner {
 
 namespace {
@@ -214,16 +209,6 @@ DartRunner::DartRunner(sys::ComponentContext* context) : context_(context) {
 
   Dart_InitializeParams params = {};
   params.version = DART_INITIALIZE_PARAMS_CURRENT_VERSION;
-#if defined(AOT_RUNTIME)
-  params.vm_snapshot_data = ::_kDartVmSnapshotData;
-  params.vm_snapshot_instructions = ::_kDartVmSnapshotInstructions;
-#else
-  if (!dart_utils::MappedResource::LoadFromNamespace(
-          nullptr, "/pkg/data/vm_snapshot_data.bin", vm_snapshot_data_)) {
-    FML_LOG(FATAL) << "Failed to load vm snapshot data";
-  }
-  params.vm_snapshot_data = vm_snapshot_data_.address();
-#endif
   params.create_group = IsolateGroupCreateCallback;
   params.shutdown_isolate = IsolateShutdownCallback;
   params.cleanup_group = IsolateGroupCleanupCallback;