commit 4887ca4af8ff5a5b7a5b547b2b2d87f3b698badb
author Samir Jindel <sjindel@google.com> Mon Feb 10 13:30:41 2020 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Mon Feb 10 13:30:41 2020 +0000
tree 267887b58b5291f8dd45666862c5e0dc56d71a26
parent 62ecc2b88288a31ef01c09aba73d36f77517aafe

[flutter] Use ELF for Dart AOT snapshots.

Depends on https://github.com/flutter/engine/pull/13896.

Change-Id: Ib74264e1e5bf6cabb72dd080190b272209f517a9

runtime/dart/dart_component.gni

diff --git a/runtime/dart/dart_component.gni b/runtime/dart/dart_component.gni
index bd322da..097a2ca 100644
--- a/runtime/dart/dart_component.gni
+++ b/runtime/dart/dart_component.gni
@@ -558,26 +558,10 @@
       resources_path = "${component.component_name}/"
       resources += [
         {
-          path = rebase_path(component.snapshot_data_path)
-          dest = "${resources_path}isolate_snapshot_data.bin"
-        },
-        {
-          path = rebase_path(component.snapshot_instructions_path)
-          dest = "${resources_path}isolate_snapshot_instructions.bin"
+          path = rebase_path(component.snapshot_path)
+          dest = "${resources_path}app_aot_snapshot.so"
         },
       ]
-      if (component.component_type == "flutter") {
-        resources += [
-          {
-            path = rebase_path(component.vm_snapshot_data_path)
-            dest = "${resources_path}vm_snapshot_data.bin"
-          },
-          {
-            path = rebase_path(component.vm_snapshot_instructions_path)
-            dest = "${resources_path}vm_snapshot_instructions.bin"
-          },
-        ]
-      }
     }
 
     if (defined(invoker.invoker_resources)) {
@@ -786,12 +770,7 @@
     }
 
     # TODO(rmacnak): VM snapshot is ignored. Allow skipping its generation.
-    vm_snapshot_data_path = "$target_gen_dir/${kernel_name}_vm_data.aotsnapshot"
-    vm_snapshot_instructions_path =
-        "$target_gen_dir/${kernel_name}_vm_instructions.aotsnapshot"
-    snapshot_data_path = "$target_gen_dir/${kernel_name}_data.aotsnapshot"
-    snapshot_instructions_path =
-        "$target_gen_dir/${kernel_name}_instructions.aotsnapshot"
+    snapshot_path = "$target_gen_dir/${kernel_name}_snapshot.so"
     snapshot_target_name = kernel_name + "_snapshot"
 
     stats_target_name = "${kernel_name}_stats"
@@ -808,10 +787,7 @@
         kernel_path,
       ]
       outputs = [
-        vm_snapshot_data_path,
-        vm_snapshot_instructions_path,
-        snapshot_data_path,
-        snapshot_instructions_path,
+        snapshot_path,
         stats_json_path,
       ]
 
@@ -824,13 +800,8 @@
       args = [
         "--no_causal_async_stacks",
         "--deterministic",
-        "--snapshot_kind=app-aot-blobs",
-        "--vm_snapshot_data=" + rebase_path(vm_snapshot_data_path),
-        "--vm_snapshot_instructions=" +
-            rebase_path(vm_snapshot_instructions_path),
-        "--isolate_snapshot_data=" + rebase_path(snapshot_data_path),
-        "--isolate_snapshot_instructions=" +
-            rebase_path(snapshot_instructions_path),
+        "--snapshot_kind=app-aot-elf",
+        "--elf=" + rebase_path(snapshot_path),
         "--print-instructions-sizes-to=" + rebase_path(stats_json_path),
       ]
 
@@ -920,10 +891,7 @@
 
           snapshot_target_name = snapshot_target_name
           stats_target_name = stats_target_name
-          vm_snapshot_data_path = vm_snapshot_data_path
-          vm_snapshot_instructions_path = vm_snapshot_instructions_path
-          snapshot_data_path = snapshot_data_path
-          snapshot_instructions_path = snapshot_instructions_path
+          snapshot_path = snapshot_path
 
           deps = component.deps
           sources = component.sources
@@ -939,8 +907,7 @@
 
           snapshot_target_name = snapshot_target_name
           stats_target_name = stats_target_name
-          snapshot_data_path = snapshot_data_path
-          snapshot_instructions_path = snapshot_instructions_path
+          snapshot_path = snapshot_path
 
           deps = component.deps
           sources = component.sources