@@ -79,47 +79,165 @@ if (is_fuchsia) {
7979 " $flutter_root /content_handler:aot" ,
8080 ]
8181 if (flutter_runtime_mode != " release" ) {
82- deps += [ " //third_party/dart/runtime/observatory:embedded_archive_observatory" ]
82+ deps += [
83+ " //third_party/dart/runtime/observatory:embedded_archive_observatory" ,
84+ ]
8385 }
8486
8587 binary = " flutter_aot_runner"
8688
8789 if (flutter_runtime_mode != " release" ) {
88- resources = [ {
89- path = rebase_path (
90- " $root_gen_dir /observatory/embedded_archive_observatory.tar" )
91- dest = " observatory.tar"
92- } ]
90+ resources = [
91+ {
92+ path = rebase_path (
93+ " $root_gen_dir /observatory/embedded_archive_observatory.tar" )
94+ dest = " observatory.tar"
95+ },
96+ ]
9397 }
9498
95- meta = [ {
96- path = rebase_path (" content_handler/meta/sandbox" )
97- dest = " sandbox"
98- } ]
99+ meta = [
100+ {
101+ path = rebase_path (" content_handler/meta/sandbox" )
102+ dest = " sandbox"
103+ },
104+ ]
105+ }
106+
107+ package (" flutter2_aot_runner" ) {
108+ deps = [
109+ " $flutter_root /content_handler:aot" ,
110+ ]
111+ if (flutter_runtime_mode != " release" ) {
112+ deps += [
113+ " //third_party/dart/runtime/observatory:embedded_archive_observatory" ,
114+ ]
115+ }
116+
117+ binary = " flutter_aot_runner"
118+
119+ if (flutter_runtime_mode != " release" ) {
120+ resources = [
121+ {
122+ path = rebase_path (
123+ " $root_gen_dir /observatory/embedded_archive_observatory.tar" )
124+ dest = " observatory.tar"
125+ },
126+ ]
127+ }
128+
129+ meta = [
130+ {
131+ path = rebase_path (" content_handler/meta/sandbox" )
132+ dest = " sandbox"
133+ },
134+ ]
99135 }
100136
101137 package (" flutter_jit_runner" ) {
138+ snapshot_label = " $flutter_root /lib/snapshot:generate_snapshot_bin"
139+ snapshot_gen_dir = get_label_info (snapshot_label , " target_gen_dir" )
140+
141+ deps = [
142+ " $flutter_root /content_handler:jit" ,
143+ snapshot_label ,
144+ ]
145+ if (flutter_runtime_mode != " release" ) {
146+ deps += [
147+ " //third_party/dart/runtime/observatory:embedded_archive_observatory" ,
148+ ]
149+ }
150+
151+ binary = " flutter_jit_runner"
152+
153+ resources = [
154+ {
155+ path = rebase_path (" $snapshot_gen_dir /vm_isolate_snapshot.bin" )
156+ dest = " vm_snapshot_data.bin"
157+ },
158+ {
159+ path = rebase_path (" $snapshot_gen_dir /vm_snapshot_instructions.bin" )
160+ dest = " vm_snapshot_instructions.bin"
161+ },
162+ {
163+ path = rebase_path (" $snapshot_gen_dir /isolate_snapshot.bin" )
164+ dest = " isolate_core_snapshot_data.bin"
165+ },
166+ {
167+ path =
168+ rebase_path (" $snapshot_gen_dir /isolate_snapshot_instructions.bin" )
169+ dest = " isolate_core_snapshot_instructions.bin"
170+ },
171+ ]
172+ if (flutter_runtime_mode != " release" ) {
173+ resources += [
174+ {
175+ path = rebase_path (
176+ " $root_gen_dir /observatory/embedded_archive_observatory.tar" )
177+ dest = " observatory.tar"
178+ },
179+ ]
180+ }
181+
182+ meta = [
183+ {
184+ path = rebase_path (" content_handler/meta/sandbox" )
185+ dest = " sandbox"
186+ },
187+ ]
188+ }
189+
190+ package (" flutter2_jit_runner" ) {
191+ snapshot_label = " //topaz/runtime/flutter_runner/kernel:kernel_core_snapshot"
192+ snapshot_gen_dir = get_label_info (snapshot_label , " target_gen_dir" )
193+
102194 deps = [
103195 " $flutter_root /content_handler:jit" ,
196+ snapshot_label ,
104197 ]
105198 if (flutter_runtime_mode != " release" ) {
106- deps += [ " //third_party/dart/runtime/observatory:embedded_archive_observatory" ]
199+ deps += [
200+ " //third_party/dart/runtime/observatory:embedded_archive_observatory" ,
201+ ]
107202 }
108203
109204 binary = " flutter_jit_runner"
110205
206+ resources = [
207+ {
208+ path = rebase_path (" $snapshot_gen_dir /vm_isolate_snapshot.bin" )
209+ dest = " vm_snapshot_data.bin"
210+ },
211+ {
212+ path = rebase_path (" $snapshot_gen_dir /vm_snapshot_instructions.bin" )
213+ dest = " vm_snapshot_instructions.bin"
214+ },
215+ {
216+ path = rebase_path (" $snapshot_gen_dir /isolate_snapshot.bin" )
217+ dest = " isolate_core_snapshot_data.bin"
218+ },
219+ {
220+ path =
221+ rebase_path (" $snapshot_gen_dir /isolate_snapshot_instructions.bin" )
222+ dest = " isolate_core_snapshot_instructions.bin"
223+ },
224+ ]
111225 if (flutter_runtime_mode != " release" ) {
112- resources = [ {
113- path = rebase_path (
114- " $root_gen_dir /observatory/embedded_archive_observatory.tar" )
115- dest = " observatory.tar"
116- } ]
226+ resources += [
227+ {
228+ path = rebase_path (
229+ " $root_gen_dir /observatory/embedded_archive_observatory.tar" )
230+ dest = " observatory.tar"
231+ },
232+ ]
117233 }
118234
119- meta = [ {
120- path = rebase_path (" content_handler/meta/sandbox" )
121- dest = " sandbox"
122- } ]
235+ meta = [
236+ {
237+ path = rebase_path (" content_handler/meta/sandbox" )
238+ dest = " sandbox"
239+ },
240+ ]
123241 }
124242} else {
125243 group (" dist" ) {
0 commit comments