Skip to content

F
Front-End
Unverified Commit b8b6d416 authored by Ryan Macnak's avatar Ryan Macnak Committed by GitHub
Browse files
Options

Build snapshots with --sync-async to match the engine. (#19495) 

Bug: https://github.com/flutter/flutter/issues/19494
parent 4afc9f89
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 0 deletions
packages/flutter_tools/lib/src/base/build.dart
View file @ b8b6d416
...@@ -199,6 +199,7 @@ class AOTSnapshotter { ...@@ -199,6 +199,7 @@ class AOTSnapshotter {
genSnapshotArgs.addAll(<String>[ genSnapshotArgs.addAll(<String>[
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
]); ]);
} }
if (extraGenSnapshotOptions != null && extraGenSnapshotOptions.isNotEmpty) { if (extraGenSnapshotOptions != null && extraGenSnapshotOptions.isNotEmpty) {
...@@ -443,6 +444,7 @@ class CoreJITSnapshotter { ...@@ -443,6 +444,7 @@ class CoreJITSnapshotter {
final List<String> genSnapshotArgs = <String>[ final List<String> genSnapshotArgs = <String>[
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
]; ];
if (buildMode == BuildMode.debug) { if (buildMode == BuildMode.debug) {
genSnapshotArgs.add('--enable_asserts'); genSnapshotArgs.add('--enable_asserts');
......
packages/flutter_tools/test/base/build_test.dart
View file @ b8b6d416
...@@ -408,6 +408,7 @@ void main() { ...@@ -408,6 +408,7 @@ void main() {
'--embedder_entry_points_manifest=$kIoEntries', '--embedder_entry_points_manifest=$kIoEntries',
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--snapshot_kind=app-aot-assembly', '--snapshot_kind=app-aot-assembly',
'--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}', '--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}',
'--no-sim-use-hardfp', '--no-sim-use-hardfp',
...@@ -454,6 +455,7 @@ void main() { ...@@ -454,6 +455,7 @@ void main() {
'--embedder_entry_points_manifest=$kIoEntries', '--embedder_entry_points_manifest=$kIoEntries',
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--snapshot_kind=app-aot-assembly', '--snapshot_kind=app-aot-assembly',
'--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}', '--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}',
'main.dill', 'main.dill',
...@@ -500,6 +502,7 @@ void main() { ...@@ -500,6 +502,7 @@ void main() {
'--embedder_entry_points_manifest=$kIoEntries', '--embedder_entry_points_manifest=$kIoEntries',
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--snapshot_kind=app-aot-blobs', '--snapshot_kind=app-aot-blobs',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
'--isolate_snapshot_data=build/foo/isolate_snapshot_data', '--isolate_snapshot_data=build/foo/isolate_snapshot_data',
...@@ -551,6 +554,7 @@ void main() { ...@@ -551,6 +554,7 @@ void main() {
'--embedder_entry_points_manifest=$kIoEntries', '--embedder_entry_points_manifest=$kIoEntries',
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--snapshot_kind=app-aot-blobs', '--snapshot_kind=app-aot-blobs',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
'--isolate_snapshot_data=build/foo/isolate_snapshot_data', '--isolate_snapshot_data=build/foo/isolate_snapshot_data',
...@@ -598,6 +602,7 @@ void main() { ...@@ -598,6 +602,7 @@ void main() {
'--embedder_entry_points_manifest=$kIoEntries', '--embedder_entry_points_manifest=$kIoEntries',
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--snapshot_kind=app-aot-assembly', '--snapshot_kind=app-aot-assembly',
'--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}', '--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}',
'--no-sim-use-hardfp', '--no-sim-use-hardfp',
...@@ -644,6 +649,7 @@ void main() { ...@@ -644,6 +649,7 @@ void main() {
'--embedder_entry_points_manifest=$kIoEntries', '--embedder_entry_points_manifest=$kIoEntries',
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--snapshot_kind=app-aot-assembly', '--snapshot_kind=app-aot-assembly',
'--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}', '--assembly=${fs.path.join(outputPath, 'snapshot_assembly.S')}',
'main.dill', 'main.dill',
...@@ -709,6 +715,7 @@ void main() { ...@@ -709,6 +715,7 @@ void main() {
'--embedder_entry_points_manifest=$kIoEntries', '--embedder_entry_points_manifest=$kIoEntries',
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--snapshot_kind=app-aot-blobs', '--snapshot_kind=app-aot-blobs',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
'--isolate_snapshot_data=build/foo/isolate_snapshot_data', '--isolate_snapshot_data=build/foo/isolate_snapshot_data',
...@@ -760,6 +767,7 @@ void main() { ...@@ -760,6 +767,7 @@ void main() {
'--embedder_entry_points_manifest=$kIoEntries', '--embedder_entry_points_manifest=$kIoEntries',
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--snapshot_kind=app-aot-blobs', '--snapshot_kind=app-aot-blobs',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
'--isolate_snapshot_data=build/foo/isolate_snapshot_data', '--isolate_snapshot_data=build/foo/isolate_snapshot_data',
...@@ -838,6 +846,7 @@ void main() { ...@@ -838,6 +846,7 @@ void main() {
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--enable_asserts', '--enable_asserts',
'--snapshot_kind=core-jit', '--snapshot_kind=core-jit',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
...@@ -881,6 +890,7 @@ void main() { ...@@ -881,6 +890,7 @@ void main() {
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--enable_asserts', '--enable_asserts',
'--snapshot_kind=core-jit', '--snapshot_kind=core-jit',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
...@@ -933,6 +943,7 @@ void main() { ...@@ -933,6 +943,7 @@ void main() {
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--snapshot_kind=core-jit', '--snapshot_kind=core-jit',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
'--isolate_snapshot_data=build/foo/isolate_snapshot_data', '--isolate_snapshot_data=build/foo/isolate_snapshot_data',
...@@ -975,6 +986,7 @@ void main() { ...@@ -975,6 +986,7 @@ void main() {
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--snapshot_kind=core-jit', '--snapshot_kind=core-jit',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
'--isolate_snapshot_data=build/foo/isolate_snapshot_data', '--isolate_snapshot_data=build/foo/isolate_snapshot_data',
...@@ -1026,6 +1038,7 @@ void main() { ...@@ -1026,6 +1038,7 @@ void main() {
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--snapshot_kind=core-jit', '--snapshot_kind=core-jit',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
'--isolate_snapshot_data=build/foo/isolate_snapshot_data', '--isolate_snapshot_data=build/foo/isolate_snapshot_data',
...@@ -1068,6 +1081,7 @@ void main() { ...@@ -1068,6 +1081,7 @@ void main() {
expect(genSnapshot.additionalArgs, <String>[ expect(genSnapshot.additionalArgs, <String>[
'--reify-generic-functions', '--reify-generic-functions',
'--strong', '--strong',
'--sync-async',
'--snapshot_kind=core-jit', '--snapshot_kind=core-jit',
'--vm_snapshot_data=build/foo/vm_snapshot_data', '--vm_snapshot_data=build/foo/vm_snapshot_data',
'--isolate_snapshot_data=build/foo/isolate_snapshot_data', '--isolate_snapshot_data=build/foo/isolate_snapshot_data',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab