|
98 | 98 | }] |
99 | 99 | ], |
100 | 100 | }, |
101 | | - 'includes': ['toolchain.gypi', 'features.gypi', 'v8_external_snapshot.gypi'], |
| 101 | + 'includes': ['toolchain.gypi', 'features.gypi'], |
102 | 102 | 'targets': [ |
103 | 103 | { |
104 | 104 | 'target_name': 'run_torque', |
|
257 | 257 | }, # generate_bytecode_builtins_list |
258 | 258 |
|
259 | 259 | { |
260 | | - # This rule delegates to either v8_snapshot, v8_nosnapshot, or |
261 | | - # v8_external_snapshot, depending on the current variables. |
| 260 | + # This rule delegates to either v8_snapshot or v8_nosnapshot depending on |
| 261 | + # the current variables. |
262 | 262 | # The intention is to make the 'calling' rules a bit simpler. |
263 | 263 | 'target_name': 'v8_maybe_snapshot', |
264 | 264 | 'type': 'none', |
265 | 265 | 'toolsets': ['target'], |
266 | 266 | 'hard_dependency': 1, |
267 | 267 | 'conditions': [ |
268 | | - ['v8_use_snapshot!=1', { |
269 | | - # The dependency on v8_base should come from a transitive |
270 | | - # dependency however the Android toolchain requires libv8_base.a |
271 | | - # to appear before libv8_snapshot.a so it's listed explicitly. |
272 | | - 'dependencies': ['v8_base', 'v8_init', 'v8_nosnapshot'], |
273 | | - }], |
274 | | - ['v8_use_snapshot==1 and v8_use_external_startup_data==0', { |
275 | | - # The dependency on v8_base should come from a transitive |
276 | | - # dependency however the Android toolchain requires libv8_base.a |
277 | | - # to appear before libv8_snapshot.a so it's listed explicitly. |
| 268 | + # The dependency on v8_base should come from a transitive |
| 269 | + # dependency however the Android toolchain requires libv8_base.a |
| 270 | + # to appear before libv8_snapshot.a so it's listed explicitly. |
| 271 | + ['v8_use_snapshot==1', { |
278 | 272 | 'dependencies': ['v8_base', 'v8_snapshot'], |
279 | | - }], |
280 | | - ['v8_use_snapshot==1 and v8_use_external_startup_data==1 and want_separate_host_toolset==0', { |
281 | | - 'dependencies': ['v8_base', 'v8_external_snapshot'], |
282 | | - }], |
283 | | - ['v8_use_snapshot==1 and v8_use_external_startup_data==1 and want_separate_host_toolset==1', { |
284 | | - 'dependencies': ['v8_base', 'v8_external_snapshot'], |
| 273 | + }, { |
| 274 | + 'dependencies': ['v8_base', 'v8_init', 'v8_nosnapshot'], |
285 | 275 | }], |
286 | 276 | ] |
287 | 277 | }, # v8_maybe_snapshot |
|
438 | 428 | # but the target OS is really <(OS). |
439 | 429 | '--target_os=<(OS)', |
440 | 430 | '--target_arch=<(v8_target_arch)', |
| 431 | + '--startup_src', '<(INTERMEDIATE_DIR)/snapshot.cc', |
441 | 432 | ], |
442 | 433 | }, |
443 | 434 | 'inputs': [ |
444 | 435 | '<(mksnapshot_exec)', |
445 | 436 | ], |
| 437 | + 'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"], |
446 | 438 | 'process_outputs_as_sources': 1, |
447 | 439 | 'conditions': [ |
448 | 440 | ['v8_enable_embedded_builtins', { |
|
468 | 460 | 'mksnapshot_flags': ['--v8_os_page_size', '<(v8_os_page_size)'], |
469 | 461 | }, |
470 | 462 | }], |
471 | | - ['v8_use_external_startup_data', { |
472 | | - 'outputs': ['<(INTERMEDIATE_DIR)/snapshot_blob.bin', ], |
473 | | - 'variables': { |
474 | | - 'mksnapshot_flags': ['--startup_blob', '<(INTERMEDIATE_DIR)/snapshot_blob.bin', ], |
475 | | - }, |
476 | | - }, { |
477 | | - 'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"], |
478 | | - 'variables': { |
479 | | - 'mksnapshot_flags': ['--startup_src', '<(INTERMEDIATE_DIR)/snapshot.cc', ], |
480 | | - }, |
481 | | - }], |
482 | 463 | ['v8_embed_script != ""', { |
483 | 464 | 'inputs': ['<(v8_embed_script)'], |
484 | 465 | 'variables': { |
|
0 commit comments