From 2882ce911df821895c70d2ee99a88a4554fa3221 Mon Sep 17 00:00:00 2001 From: Ujjwal Sharma Date: Thu, 29 Aug 2019 21:57:09 +0530 Subject: [PATCH] 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: https://github.com/nodejs/node/pull/29363#issuecomment-526103293 Fixes: https://github.com/nodejs/node/issues/28964 PR-URL: https://github.com/nodejs/node/pull/29369 Reviewed-By: Ben Noordhuis Reviewed-By: Jiawen Geng Reviewed-By: David Carlier --- tools/v8_gypfiles/broken/standalone.gypi | 6 - tools/v8_gypfiles/features.gypi | 7 - tools/v8_gypfiles/v8.gyp | 41 ++-- tools/v8_gypfiles/v8_external_snapshot.gypi | 201 -------------------- 4 files changed, 11 insertions(+), 244 deletions(-) delete mode 100644 tools/v8_gypfiles/v8_external_snapshot.gypi diff --git a/tools/v8_gypfiles/broken/standalone.gypi b/tools/v8_gypfiles/broken/standalone.gypi index f01b5975fc587b..f01067943405d3 100644 --- a/tools/v8_gypfiles/broken/standalone.gypi +++ b/tools/v8_gypfiles/broken/standalone.gypi @@ -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', diff --git a/tools/v8_gypfiles/features.gypi b/tools/v8_gypfiles/features.gypi index bcbd9d2268bcbc..0bf16e59d52be6 100644 --- a/tools/v8_gypfiles/features.gypi +++ b/tools/v8_gypfiles/features.gypi @@ -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, @@ -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',], }], diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index f133aea61178e8..00e285ec2c2025 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -98,7 +98,7 @@ }] ], }, - 'includes': ['toolchain.gypi', 'features.gypi', 'v8_external_snapshot.gypi'], + 'includes': ['toolchain.gypi', 'features.gypi'], 'targets': [ { 'target_name': 'run_torque', @@ -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'], - }], - ['v8_use_snapshot==1 and v8_use_external_startup_data==1 and want_separate_host_toolset==0', { - '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 @@ -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', { @@ -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', ], - }, - }], ['v8_embed_script != ""', { 'inputs': ['<(v8_embed_script)'], 'variables': { diff --git a/tools/v8_gypfiles/v8_external_snapshot.gypi b/tools/v8_gypfiles/v8_external_snapshot.gypi deleted file mode 100644 index 38b7282bd37d00..00000000000000 --- a/tools/v8_gypfiles/v8_external_snapshot.gypi +++ /dev/null @@ -1,201 +0,0 @@ -# Keeping this separate since Node.js does use it -{ - 'targets': [ - { - 'target_name': 'v8_external_snapshot', - 'type': 'static_library', - 'conditions': [ - ['v8_use_external_startup_data==1', { - 'conditions': [ - ['want_separate_host_toolset==1', { - 'toolsets': ['host', 'target'], - 'dependencies': [ - 'mksnapshot#host', - 'js2c_extras#host', - 'natives_blob', - ] - }, { - 'toolsets': ['target'], - 'dependencies': [ - 'mksnapshot', - 'natives_blob', - ], - }], - ['component=="shared_library"', { - 'defines': [ - 'BUILDING_V8_SHARED', - ], - 'direct_dependent_settings': { - 'defines': [ - 'USING_V8_SHARED', - ], - }, - }], - ], - 'dependencies': [ - 'v8_base', - ], - 'sources': [ - '<(V8_ROOT)/src/setup-isolate-deserialize.cc', - '<(V8_ROOT)/src/snapshot/embedded-empty.cc', - '<(V8_ROOT)/src/snapshot/natives-external.cc', - '<(V8_ROOT)/src/snapshot/snapshot-external.cc', - '<(embedded_builtins_snapshot_src)', - ], - 'actions': [ - { - 'action_name': 'run_mksnapshot (external)', - 'inputs': [ - '<(mksnapshot_exec)', - ], - 'variables': { - 'mksnapshot_flags': [], - 'conditions': [ - ['v8_random_seed!=0', { - 'mksnapshot_flags': ['--random-seed', '<(v8_random_seed)'], - }], - ['v8_vector_stores!=0', { - 'mksnapshot_flags': ['--vector-stores'], - }], - ['v8_os_page_size!=0', { - 'mksnapshot_flags': ['--v8_os_page_size', '<(v8_os_page_size)'], - }], - ['v8_enable_embedded_builtins=1', { - # 'embedded_builtins_snapshot_src': [ "$target_gen_dir/embedded${suffix}.cc" ], - # 'mksnapshot_flags': ["--embedded_src", "$target_gen_dir/embedded${suffix}.cc",], - # if (invoker.embedded_variant != "") { - # args += [ - # "--embedded_variant", - # invoker.embedded_variant, - # ] - # } - }, - ], - ], - }, - 'conditions': [ - ['v8_embed_script!=""', { - 'inputs': [ - '<(v8_embed_script)', - ], - }], - ['want_separate_host_toolset==1', { - 'target_conditions': [ - ['_toolset=="host"', { - 'outputs': [ - '<(PRODUCT_DIR)/snapshot_blob_host.bin', - '<(embedded_builtins_snapshot_src)' - ], - 'action': [ - '<(mksnapshot_exec)', - '<@(mksnapshot_flags)', - '--startup_blob', '<(PRODUCT_DIR)/snapshot_blob_host.bin', - '<(embed_script)', - '<(warmup_script)', - ], - }, { - 'outputs': [ - '<(PRODUCT_DIR)/snapshot_blob.bin', - ], - 'action': [ - '<(mksnapshot_exec)', - '<@(mksnapshot_flags)', - '--startup_blob', '<(PRODUCT_DIR)/snapshot_blob.bin', - '<(embed_script)', - '<(warmup_script)', - ], - }], - ], - }, { - 'outputs': [ - '<(PRODUCT_DIR)/snapshot_blob.bin', - '<(embedded_builtins_snapshot_src)' - ], - 'action': [ - '<(mksnapshot_exec)', - '<@(mksnapshot_flags)', - '--startup_blob', '<(PRODUCT_DIR)/snapshot_blob.bin', - '<(embed_script)', - '<(warmup_script)', - ], - }], - ], - }, - ], - }], - ], - }, # v8_external_snapshot - { - 'target_name': 'natives_blob', - 'type': 'none', - 'conditions': [ - ['want_separate_host_toolset==1', { - 'toolsets': ['host', 'target'], - }, { - 'toolsets': ['target'], - }], - ['v8_use_external_startup_data==1', { - 'conditions': [ - ['want_separate_host_toolset==1', { - 'dependencies': ['js2c_extras#host'], - }], - ], - 'actions': [ - { - 'action_name': 'js2c_extras_bin', - 'inputs': [ - '<(V8_ROOT)/tools/js2c.py', - '<@(v8_extra_library_files)', - ], - 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/libraries-extras.bin'], - 'action': [ - 'python', - '<(V8_ROOT)/tools/js2c.py', - '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc', - 'EXTRAS', - '<@(v8_extra_library_files)', - '--startup_blob', '<@(_outputs)', - '--nojs', - ], - }, - { - 'action_name': 'concatenate_natives_blob', - 'inputs': [ - '<(V8_ROOT)/tools/concatenate-files.py', - '<(SHARED_INTERMEDIATE_DIR)/libraries-extras.bin', - ], - 'conditions': [ - ['want_separate_host_toolset==1', { - 'target_conditions': [ - ['_toolset=="host"', { - 'outputs': [ - '<(PRODUCT_DIR)/natives_blob_host.bin', - ], - 'action': [ - 'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin' - ], - }, { - 'outputs': [ - '<(PRODUCT_DIR)/natives_blob.bin', - ], - 'action': [ - 'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin' - ], - }], - ], - }, { - 'outputs': [ - '<(PRODUCT_DIR)/natives_blob.bin', - ], - 'action': [ - 'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin' - ], - }], - ], - }, - ], - }], - ] - }, # natives_blob - ] -}