Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: delete v8_external_snapshot.gypi #29369

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions tools/v8_gypfiles/broken/standalone.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,6 @@
# speeds.
'v8_optimized_debug%': 0,

# Use external files for startup data blobs:
# the JS builtins sources and the start snapshot.
# Embedders that don't use standalone.gypi will need to add
# their own default value.
'v8_use_external_startup_data%': 1,

# Relative path to icu.gyp from this file.
'icu_gyp_path': '../third_party/icu/icu.gyp',

Expand Down
7 changes: 0 additions & 7 deletions tools/v8_gypfiles/features.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,6 @@
# http://v8project.blogspot.com/2015/09/custom-startup-snapshots.html
'v8_use_snapshot%': 1,

# Use external files for startup data blobs:
# the JS builtins sources and the start snapshot.
'v8_use_external_startup_data%': 0,

# Enable ECMAScript Internationalization API. Enabling this feature will
# add a dependency on the ICU library.
'v8_enable_i18n_support%': 1,
Expand Down Expand Up @@ -284,9 +280,6 @@
}],
],
}],
['v8_use_external_startup_data==1', {
'defines': ['V8_USE_EXTERNAL_STARTUP_DATA',],
}],
['v8_enable_concurrent_marking==1', {
'defines': ['V8_CONCURRENT_MARKING',],
}],
Expand Down
41 changes: 11 additions & 30 deletions tools/v8_gypfiles/v8.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
}]
],
},
'includes': ['toolchain.gypi', 'features.gypi', 'v8_external_snapshot.gypi'],
'includes': ['toolchain.gypi', 'features.gypi'],
'targets': [
{
'target_name': 'run_torque',
Expand Down Expand Up @@ -257,31 +257,21 @@
}, # generate_bytecode_builtins_list

{
# This rule delegates to either v8_snapshot, v8_nosnapshot, or
# v8_external_snapshot, depending on the current variables.
# This rule delegates to either v8_snapshot or v8_nosnapshot depending on
# the current variables.
# The intention is to make the 'calling' rules a bit simpler.
'target_name': 'v8_maybe_snapshot',
'type': 'none',
'toolsets': ['target'],
'hard_dependency': 1,
'conditions': [
['v8_use_snapshot!=1', {
# The dependency on v8_base should come from a transitive
# dependency however the Android toolchain requires libv8_base.a
# to appear before libv8_snapshot.a so it's listed explicitly.
'dependencies': ['v8_base', 'v8_init', 'v8_nosnapshot'],
}],
['v8_use_snapshot==1 and v8_use_external_startup_data==0', {
# The dependency on v8_base should come from a transitive
# dependency however the Android toolchain requires libv8_base.a
# to appear before libv8_snapshot.a so it's listed explicitly.
# The dependency on v8_base should come from a transitive
# dependency however the Android toolchain requires libv8_base.a
# to appear before libv8_snapshot.a so it's listed explicitly.
['v8_use_snapshot==1', {
'dependencies': ['v8_base', 'v8_snapshot'],
bnoordhuis marked this conversation as resolved.
Show resolved Hide resolved
}],
['v8_use_snapshot==1 and v8_use_external_startup_data==1 and want_separate_host_toolset==0', {
ryzokuken marked this conversation as resolved.
Show resolved Hide resolved
'dependencies': ['v8_base', 'v8_external_snapshot'],
}],
['v8_use_snapshot==1 and v8_use_external_startup_data==1 and want_separate_host_toolset==1', {
'dependencies': ['v8_base', 'v8_external_snapshot'],
}, {
'dependencies': ['v8_base', 'v8_init', 'v8_nosnapshot'],
}],
]
}, # v8_maybe_snapshot
Expand Down Expand Up @@ -438,11 +428,13 @@
# but the target OS is really <(OS).
'--target_os=<(OS)',
'--target_arch=<(v8_target_arch)',
'--startup_src', '<(INTERMEDIATE_DIR)/snapshot.cc',
],
},
'inputs': [
'<(mksnapshot_exec)',
],
'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"],
'process_outputs_as_sources': 1,
'conditions': [
['v8_enable_embedded_builtins', {
Expand All @@ -468,17 +460,6 @@
'mksnapshot_flags': ['--v8_os_page_size', '<(v8_os_page_size)'],
},
}],
['v8_use_external_startup_data', {
'outputs': ['<(INTERMEDIATE_DIR)/snapshot_blob.bin', ],
'variables': {
'mksnapshot_flags': ['--startup_blob', '<(INTERMEDIATE_DIR)/snapshot_blob.bin', ],
},
}, {
'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"],
'variables': {
'mksnapshot_flags': ['--startup_src', '<(INTERMEDIATE_DIR)/snapshot.cc', ],
},
}],
bnoordhuis marked this conversation as resolved.
Show resolved Hide resolved
['v8_embed_script != ""', {
'inputs': ['<(v8_embed_script)'],
'variables': {
Expand Down
201 changes: 0 additions & 201 deletions tools/v8_gypfiles/v8_external_snapshot.gypi

This file was deleted.