From 0bcf881ae9ca6cf5bd6d4f0e4395ee70100dae68 Mon Sep 17 00:00:00 2001 From: Matt Gajownik Date: Fri, 7 Feb 2025 18:15:26 +1100 Subject: [PATCH] cmake: Don't copy legacy, unused Chromium file While CEF continues to ship & read this up to and including in CEF 6834, it hasn't actually been used since Chromium 66, so we can safely remove it without causing regressions in 5060 or 6533. https://bitbucket.org/chromiumembedded/cef/commits/719f423e7030540f9b334d12e2ef9f82fc759a36 --- cmake/linux/helpers.cmake | 6 ++---- cmake/windows/helpers.cmake | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cmake/linux/helpers.cmake b/cmake/linux/helpers.cmake index fe4249685..c0966e692 100644 --- a/cmake/linux/helpers.cmake +++ b/cmake/linux/helpers.cmake @@ -174,9 +174,8 @@ function(set_target_properties_obs target) COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${imported_location}" "${cef_location}/chrome-sandbox" "${cef_location}/libEGL.so" "${cef_location}/libGLESv2.so" "${cef_location}/libvk_swiftshader.so" - "${cef_location}/libvulkan.so.1" "${cef_location}/snapshot_blob.bin" - "${cef_location}/v8_context_snapshot.bin" "${cef_location}/vk_swiftshader_icd.json" - "${OBS_OUTPUT_DIR}/$/${OBS_PLUGIN_DESTINATION}/" + "${cef_location}/libvulkan.so.1" "${cef_location}/v8_context_snapshot.bin" + "${cef_location}/vk_swiftshader_icd.json" "${OBS_OUTPUT_DIR}/$/${OBS_PLUGIN_DESTINATION}/" COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${cef_root_location}/Resources/chrome_100_percent.pak" "${cef_root_location}/Resources/chrome_200_percent.pak" "${cef_root_location}/Resources/icudtl.dat" @@ -195,7 +194,6 @@ function(set_target_properties_obs target) "${cef_location}/libGLESv2.so" "${cef_location}/libvk_swiftshader.so" "${cef_location}/libvulkan.so.1" - "${cef_location}/snapshot_blob.bin" "${cef_location}/v8_context_snapshot.bin" "${cef_location}/vk_swiftshader_icd.json" "${cef_root_location}/Resources/chrome_100_percent.pak" diff --git a/cmake/windows/helpers.cmake b/cmake/windows/helpers.cmake index 7c0abc271..fe51bac50 100644 --- a/cmake/windows/helpers.cmake +++ b/cmake/windows/helpers.cmake @@ -109,8 +109,8 @@ function(set_target_properties_obs target) COMMAND "${CMAKE_COMMAND}" -E make_directory "${OBS_OUTPUT_DIR}/$/${target_destination}" COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${imported_location}" "${cef_location}/chrome_elf.dll" - "${cef_location}/libEGL.dll" "${cef_location}/libGLESv2.dll" "${cef_location}/snapshot_blob.bin" - "${cef_location}/v8_context_snapshot.bin" "${OBS_OUTPUT_DIR}/$/${target_destination}" + "${cef_location}/libEGL.dll" "${cef_location}/libGLESv2.dll" "${cef_location}/v8_context_snapshot.bin" + "${OBS_OUTPUT_DIR}/$/${target_destination}" COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${cef_root_location}/Resources/chrome_100_percent.pak" "${cef_root_location}/Resources/chrome_200_percent.pak" "${cef_root_location}/Resources/icudtl.dat" @@ -127,7 +127,6 @@ function(set_target_properties_obs target) "${cef_location}/chrome_elf.dll" "${cef_location}/libEGL.dll" "${cef_location}/libGLESv2.dll" - "${cef_location}/snapshot_blob.bin" "${cef_location}/v8_context_snapshot.bin" "${cef_root_location}/Resources/chrome_100_percent.pak" "${cef_root_location}/Resources/chrome_200_percent.pak"