Skip to content

Commit 9de417a

Browse files
ryzokukentargos
authored andcommitted
tools: delete v8_external_snapshot.gypi
Delete the v8_external_snapshot target from gyp and disable the v8_use_external_startup_data option since it is never used anyway. Refs: #29363 (comment) Fixes: #28964 PR-URL: #29369 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: David Carlier <[email protected]>
1 parent 50d7c39 commit 9de417a

File tree

4 files changed

+11
-244
lines changed

4 files changed

+11
-244
lines changed

tools/v8_gypfiles/broken/standalone.gypi

-6
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,6 @@
227227
# speeds.
228228
'v8_optimized_debug%': 0,
229229

230-
# Use external files for startup data blobs:
231-
# the JS builtins sources and the start snapshot.
232-
# Embedders that don't use standalone.gypi will need to add
233-
# their own default value.
234-
'v8_use_external_startup_data%': 1,
235-
236230
# Relative path to icu.gyp from this file.
237231
'icu_gyp_path': '../third_party/icu/icu.gyp',
238232

tools/v8_gypfiles/features.gypi

-7
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,6 @@
187187
# http://v8project.blogspot.com/2015/09/custom-startup-snapshots.html
188188
'v8_use_snapshot%': 1,
189189

190-
# Use external files for startup data blobs:
191-
# the JS builtins sources and the start snapshot.
192-
'v8_use_external_startup_data%': 0,
193-
194190
# Enable ECMAScript Internationalization API. Enabling this feature will
195191
# add a dependency on the ICU library.
196192
'v8_enable_i18n_support%': 1,
@@ -284,9 +280,6 @@
284280
}],
285281
],
286282
}],
287-
['v8_use_external_startup_data==1', {
288-
'defines': ['V8_USE_EXTERNAL_STARTUP_DATA',],
289-
}],
290283
['v8_enable_concurrent_marking==1', {
291284
'defines': ['V8_CONCURRENT_MARKING',],
292285
}],

tools/v8_gypfiles/v8.gyp

+11-30
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
}]
9999
],
100100
},
101-
'includes': ['toolchain.gypi', 'features.gypi', 'v8_external_snapshot.gypi'],
101+
'includes': ['toolchain.gypi', 'features.gypi'],
102102
'targets': [
103103
{
104104
'target_name': 'run_torque',
@@ -257,31 +257,21 @@
257257
}, # generate_bytecode_builtins_list
258258

259259
{
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.
262262
# The intention is to make the 'calling' rules a bit simpler.
263263
'target_name': 'v8_maybe_snapshot',
264264
'type': 'none',
265265
'toolsets': ['target'],
266266
'hard_dependency': 1,
267267
'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', {
278272
'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'],
285275
}],
286276
]
287277
}, # v8_maybe_snapshot
@@ -438,11 +428,13 @@
438428
# but the target OS is really <(OS).
439429
'--target_os=<(OS)',
440430
'--target_arch=<(v8_target_arch)',
431+
'--startup_src', '<(INTERMEDIATE_DIR)/snapshot.cc',
441432
],
442433
},
443434
'inputs': [
444435
'<(mksnapshot_exec)',
445436
],
437+
'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"],
446438
'process_outputs_as_sources': 1,
447439
'conditions': [
448440
['v8_enable_embedded_builtins', {
@@ -468,17 +460,6 @@
468460
'mksnapshot_flags': ['--v8_os_page_size', '<(v8_os_page_size)'],
469461
},
470462
}],
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-
}],
482463
['v8_embed_script != ""', {
483464
'inputs': ['<(v8_embed_script)'],
484465
'variables': {

tools/v8_gypfiles/v8_external_snapshot.gypi

-201
This file was deleted.

0 commit comments

Comments
 (0)