diff --git a/BUILD.gn b/BUILD.gn index 3ec9cc535..fb69e52be 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1525,14 +1525,14 @@ if (is_mac) { sources += [ "//ui/gl/resources/angle-metal/gpu_shader_cache.bin" ] if (v8_use_external_startup_data) { - sources += [ - "$root_out_dir/snapshot_blob.bin", - ] public_deps += [ "//v8" ] if (use_v8_context_snapshot) { - sources += [ "$root_out_dir/$v8_context_snapshot_filename" ] + sources += [ "$root_build_dir/$v8_context_snapshot_filename" ] public_deps += [ "//tools/v8_context_snapshot" ] } + if (!use_v8_context_snapshot || include_both_v8_snapshots) { + sources += [ "$root_build_dir/snapshot_blob.bin" ] + } } outputs = [ diff --git a/cmake/cef_variables.cmake.in b/cmake/cef_variables.cmake.in index f1fba1617..0a051189e 100644 --- a/cmake/cef_variables.cmake.in +++ b/cmake/cef_variables.cmake.in @@ -236,7 +236,6 @@ if(OS_LINUX) libGLESv2.so libvk_swiftshader.so libvulkan.so.1 - snapshot_blob.bin v8_context_snapshot.bin vk_swiftshader_icd.json ) @@ -564,7 +563,6 @@ if(OS_WINDOWS) libcef.dll libEGL.dll libGLESv2.dll - snapshot_blob.bin v8_context_snapshot.bin vk_swiftshader.dll vk_swiftshader_icd.json diff --git a/tools/distrib/bazel/BUILD.bazel b/tools/distrib/bazel/BUILD.bazel index d78179990..070a3adea 100755 --- a/tools/distrib/bazel/BUILD.bazel +++ b/tools/distrib/bazel/BUILD.bazel @@ -249,7 +249,6 @@ filegroup( filegroup( name = "resources_opt", srcs = [ - "Release/snapshot_blob.bin", "Release/v8_context_snapshot.bin", "Release/vk_swiftshader_icd.json", "@cef//:resources_common", @@ -259,7 +258,6 @@ filegroup( filegroup( name = "resources_dbg", srcs = [ - "Debug/snapshot_blob.bin", "Debug/v8_context_snapshot.bin", "Debug/vk_swiftshader_icd.json", "@cef//:resources_common", diff --git a/tools/distrib/linux/README.redistrib.txt b/tools/distrib/linux/README.redistrib.txt index 0f4420840..256900061 100644 --- a/tools/distrib/linux/README.redistrib.txt +++ b/tools/distrib/linux/README.redistrib.txt @@ -14,7 +14,6 @@ The following components are required. CEF will not function without them. * icudtl.dat * V8 snapshot data. - * snapshot_blob.bin * v8_context_snapshot.bin Optional components: diff --git a/tools/distrib/mac/README.redistrib.txt b/tools/distrib/mac/README.redistrib.txt index 33b6eeac5..943c2fcb7 100644 --- a/tools/distrib/mac/README.redistrib.txt +++ b/tools/distrib/mac/README.redistrib.txt @@ -25,7 +25,7 @@ cefclient.app/ resources.pak <=^ gpu_shader_cache.bin <= ANGLE-Metal shader cache icudtl.dat <= unicode support - snapshot_blob.bin, v8_context_snapshot.[x86_64|arm64].bin <= V8 initial snapshot + v8_context_snapshot.[x86_64|arm64].bin <= V8 initial snapshot en.lproj/, ... <= locale-specific resources and strings Info.plist cefclient Helper.app/ @@ -63,7 +63,6 @@ The following components are required. CEF will not function without them. * Chromium Embedded Framework.framework/Resources/icudtl.dat * V8 snapshot data. - * Chromium Embedded Framework.framework/Resources/snapshot_blob.bin * Chromium Embedded Framework.framework/Resources/v8_context_snapshot.bin Optional components: diff --git a/tools/distrib/win/README.redistrib.txt b/tools/distrib/win/README.redistrib.txt index 5bc36d42a..f8eb56411 100644 --- a/tools/distrib/win/README.redistrib.txt +++ b/tools/distrib/win/README.redistrib.txt @@ -17,7 +17,6 @@ The following components are required. CEF will not function without them. * icudtl.dat * V8 snapshot data. - * snapshot_blob.bin * v8_context_snapshot.bin Optional components: diff --git a/tools/make_distrib.py b/tools/make_distrib.py index ec8f883a4..088bbcc7a 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -1108,8 +1108,7 @@ elif platform == 'windows': {'path': libcef_dll}, {'path': 'libEGL.dll'}, {'path': 'libGLESv2.dll'}, - {'path': 'snapshot_blob.bin', 'conditional': True}, - {'path': 'v8_context_snapshot.bin', 'conditional': True}, + {'path': 'v8_context_snapshot.bin'}, {'path': 'vk_swiftshader.dll'}, {'path': 'vk_swiftshader_icd.json'}, {'path': 'vulkan-1.dll'}, @@ -1432,8 +1431,7 @@ elif platform == 'linux': {'path': 'libGLESv2.so'}, {'path': 'libvk_swiftshader.so'}, {'path': 'libvulkan.so.1'}, - {'path': 'snapshot_blob.bin', 'conditional': True}, - {'path': 'v8_context_snapshot.bin', 'conditional': True}, + {'path': 'v8_context_snapshot.bin'}, {'path': 'vk_swiftshader_icd.json'}, ] # yapf: enable