diff --git a/infra/THORIUM_DEV_BOOKMARKS.html b/infra/THORIUM_DEV_BOOKMARKS.html
index c1d3b1a4..406a0aa3 100644
--- a/infra/THORIUM_DEV_BOOKMARKS.html
+++ b/infra/THORIUM_DEV_BOOKMARKS.html
@@ -13,234 +13,234 @@
Thorium Flags
THOR1
-
- BUILD.gn - Chromium Code Search
-
- PGO BUILD.gn - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- arm.gni - Chromium Code Search
-
- chromium_strings.grd - Chromium Code Search
-
- settings_chromium_strings.grdp - Chromium Code Search
-
- settings_strings.grdp - Chromium Code Search
-
- shared_settings_strings.grdp - Chromium Code Search
-
- generated_resources.grd - Chromium Code Search
-
- app_management_strings.grdp - Chromium Code Search
-
- ffmpeg_options.gni - Chromium Code Search
-
- stats_reporting_controller.cc - Chromium Code Search
-
- background_mode_manager.cc - Chromium Code Search
-
- privacy_sandbox_settings_impl.cc - Chromium Code Search
-
- tracking_protection_prefs.cc - Chromium Code Search
-
- floc_id_provider_factory.cc - Chromium Code Search
-
- profile_network_context_service.cc - Chromium Code Search
-
- stub_resolver_config_reader.cc - Chromium Code Search
-
- browser_ui_prefs.cc - Chromium Code Search
-
- google_api_keys_infobar_delegate.cc - Chromium Code Search
-
- infobar_utils.cc - Chromium Code Search
-
- default_browser_prompt.cc - Chromium Code Search
-
- bad_flags_prompt.cc - Chromium Code Search
-
- installer/linux - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- chrome.release - Chromium Code Search
-
- mini_installer_constants.cc - Chromium Code Search
-
- mini_installer_exe_main.cc - Chromium Code Search
-
- mini_installer_exe_version.rc.version - Chromium Code Search
-
- util_constants.cc - Chromium Code Search
-
- download_features.cc - Chromium Code Search
-
- prepopulated_engines.json - Chromium Code Search
-
- search_engine_countries-inc.cc - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- PGO BUILD.gn - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- arm.gni - Chromium Code Search
+
- chromium_strings.grd - Chromium Code Search
+
- settings_chromium_strings.grdp - Chromium Code Search
+
- settings_strings.grdp - Chromium Code Search
+
- shared_settings_strings.grdp - Chromium Code Search
+
- generated_resources.grd - Chromium Code Search
+
- app_management_strings.grdp - Chromium Code Search
+
- ffmpeg_options.gni - Chromium Code Search
+
- stats_reporting_controller.cc - Chromium Code Search
+
- background_mode_manager.cc - Chromium Code Search
+
- privacy_sandbox_settings_impl.cc - Chromium Code Search
+
- tracking_protection_prefs.cc - Chromium Code Search
+
- floc_id_provider_factory.cc - Chromium Code Search
+
- profile_network_context_service.cc - Chromium Code Search
+
- stub_resolver_config_reader.cc - Chromium Code Search
+
- browser_ui_prefs.cc - Chromium Code Search
+
- google_api_keys_infobar_delegate.cc - Chromium Code Search
+
- infobar_utils.cc - Chromium Code Search
+
- default_browser_prompt.cc - Chromium Code Search
+
- bad_flags_prompt.cc - Chromium Code Search
+
- installer/linux - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- chrome.release - Chromium Code Search
+
- mini_installer_constants.cc - Chromium Code Search
+
- mini_installer_exe_main.cc - Chromium Code Search
+
- mini_installer_exe_version.rc.version - Chromium Code Search
+
- util_constants.cc - Chromium Code Search
+
- download_features.cc - Chromium Code Search
+
- prepopulated_engines.json - Chromium Code Search
+
- search_engine_countries-inc.cc - Chromium Code Search
THOR2
-
- BUILD.gn - Chromium Code Search
-
- theme - Chromium Code Search
-
- theme_resources.grd - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- media_switches.cc - Chromium Code Search
-
- ffmpeg_glue.cc - Chromium Code Search
-
- ffmpeg_video_decoder.cc - Chromium Code Search
-
- ffmpeg_common.cc - Chromium Code Search
-
- vaapi_wrapper.cc - Chromium Code Search
-
- vaapi_wrapper.h - Chromium Code Search
-
- load_flags_list.h - Chromium Code Search
-
- dns_client.cc - Chromium Code Search
-
- dns_transaction.cc - Chromium Code Search
-
- url_request_http_job.cc - Chromium Code Search
-
- bpf_audio_policy_linux.cc - Chromium Code Search
-
- x11_util.cc - Chromium Code Search
-
- widevine_cdm_version.h - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- widevine.gni - Chromium Code Search
-
- cdm_registration.cc - Chromium Code Search
-
- components.css - Chromium Code Search
-
- incognito_marker.svg - Chromium Code Search
-
- icons - Chromium Code Search
-
- icon_tabs.svg - Chromium Code Search
-
- vector_icons - Chromium Code Search
-
- vector_icons - Chromium Code Search
-
- vector_icons - Chromium Code Search
-
- new_incognito_window.icon - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- theme - Chromium Code Search
+
- theme_resources.grd - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- media_switches.cc - Chromium Code Search
+
- ffmpeg_glue.cc - Chromium Code Search
+
- ffmpeg_video_decoder.cc - Chromium Code Search
+
- ffmpeg_common.cc - Chromium Code Search
+
- vaapi_wrapper.cc - Chromium Code Search
+
- vaapi_wrapper.h - Chromium Code Search
+
- load_flags_list.h - Chromium Code Search
+
- dns_client.cc - Chromium Code Search
+
- dns_transaction.cc - Chromium Code Search
+
- url_request_http_job.cc - Chromium Code Search
+
- bpf_audio_policy_linux.cc - Chromium Code Search
+
- x11_util.cc - Chromium Code Search
+
- widevine_cdm_version.h - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- widevine.gni - Chromium Code Search
+
- cdm_registration.cc - Chromium Code Search
+
- components.css - Chromium Code Search
+
- incognito_marker.svg - Chromium Code Search
+
- icons - Chromium Code Search
+
- icon_tabs.svg - Chromium Code Search
+
- vector_icons - Chromium Code Search
+
- vector_icons - Chromium Code Search
+
- vector_icons - Chromium Code Search
+
- new_incognito_window.icon - Chromium Code Search
THOR3
-
- BUILD.gn - Chromium Code Search
-
- distilledpage.css - Chromium Code Search
-
- dom_distiller_features.cc - Chromium Code Search
-
- reload_button.cc - Chromium Code Search
-
- reload_button.h - Chromium Code Search
-
- features.cc - Chromium Code Search
-
- profile_shortcut_manager_win.cc - Chromium Code Search
-
- ui_chromeos_strings.grd - Chromium Code Search
-
- autofill_payments_strings.grdp - Chromium Code Search
-
- autofill_strings.grdp - Chromium Code Search
-
- components_chromium_strings.grd - Chromium Code Search
-
- components_settings_strings.grdp - Chromium Code Search
-
- error_page_strings.grdp - Chromium Code Search
-
- flags_strings.grdp - Chromium Code Search
-
- heavy_ad_intervention_strings.grdp - Chromium Code Search
-
- management_strings.grdp - Chromium Code Search
-
- new_or_sad_tab_strings.grdp - Chromium Code Search
-
- page_info_strings.grdp - Chromium Code Search
-
- reset_password_strings.grdp - Chromium Code Search
-
- security_interstitials_strings.grdp - Chromium Code Search
-
- ssl_errors_strings.grdp - Chromium Code Search
-
- ssl_errors_strings.grdp - Chromium Code Search
-
- chromium_install_modes.cc - Chromium Code Search
-
- user_data_dir_win_unittest.cc - Chromium Code Search
-
- chrome_paths_linux.cc - Chromium Code Search
-
- chrome_paths_mac.mm - Chromium Code Search
-
- ui_util.cc - Chromium Code Search
-
- ui_features.cc - Chromium Code Search
-
- features.cc - Chromium Code Search
-
- x509_util.cc - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- distilledpage.css - Chromium Code Search
+
- dom_distiller_features.cc - Chromium Code Search
+
- reload_button.cc - Chromium Code Search
+
- reload_button.h - Chromium Code Search
+
- features.cc - Chromium Code Search
+
- profile_shortcut_manager_win.cc - Chromium Code Search
+
- ui_chromeos_strings.grd - Chromium Code Search
+
- autofill_payments_strings.grdp - Chromium Code Search
+
- autofill_strings.grdp - Chromium Code Search
+
- components_chromium_strings.grd - Chromium Code Search
+
- components_settings_strings.grdp - Chromium Code Search
+
- error_page_strings.grdp - Chromium Code Search
+
- flags_strings.grdp - Chromium Code Search
+
- heavy_ad_intervention_strings.grdp - Chromium Code Search
+
- management_strings.grdp - Chromium Code Search
+
- new_or_sad_tab_strings.grdp - Chromium Code Search
+
- page_info_strings.grdp - Chromium Code Search
+
- reset_password_strings.grdp - Chromium Code Search
+
- security_interstitials_strings.grdp - Chromium Code Search
+
- ssl_errors_strings.grdp - Chromium Code Search
+
- ssl_errors_strings.grdp - Chromium Code Search
+
- chromium_install_modes.cc - Chromium Code Search
+
- user_data_dir_win_unittest.cc - Chromium Code Search
+
- chrome_paths_linux.cc - Chromium Code Search
+
- chrome_paths_mac.mm - Chromium Code Search
+
- ui_util.cc - Chromium Code Search
+
- ui_features.cc - Chromium Code Search
+
- features.cc - Chromium Code Search
+
- x509_util.cc - Chromium Code Search
THOR4
-
- BUILD.gn - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- memory_details_linux.cc - Chromium Code Search
-
- chrome_proxy_main_win.cc - Chromium Code Search
-
- chrome_exe.ver - Chromium Code Search
-
- chrome_exe.vsprops - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- shell_main_delegate.cc - Chromium Code Search
-
- channel_info_posix.cc - Chromium Code Search
-
- shell_integration_linux.cc - Chromium Code Search
-
- launch_as_mojo_client_browsertest.cc - Chromium Code Search
-
- reorder-imports.py - Chromium Code Search
-
- vs_toolchain.py - Chromium Code Search
-
- install-build-deps.py - Chromium Code Search
-
- scheme_constants.cc - Chromium Code Search
-
- about_ui.cc - Chromium Code Search
-
- neterror - Chromium Code Search
-
- resources - Chromium Code Search
-
- flags_state.cc - Chromium Code Search
-
- shell_platform_delegate_views.cc - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- quiet_notification_permission_ui_state.cc - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- memory_details_linux.cc - Chromium Code Search
+
- chrome_proxy_main_win.cc - Chromium Code Search
+
- chrome_exe.ver - Chromium Code Search
+
- chrome_exe.vsprops - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- shell_main_delegate.cc - Chromium Code Search
+
- channel_info_posix.cc - Chromium Code Search
+
- shell_integration_linux.cc - Chromium Code Search
+
- launch_as_mojo_client_browsertest.cc - Chromium Code Search
+
- reorder-imports.py - Chromium Code Search
+
- vs_toolchain.py - Chromium Code Search
+
- install-build-deps.py - Chromium Code Search
+
- scheme_constants.cc - Chromium Code Search
+
- about_ui.cc - Chromium Code Search
+
- neterror - Chromium Code Search
+
- resources - Chromium Code Search
+
- flags_state.cc - Chromium Code Search
+
- shell_platform_delegate_views.cc - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- quiet_notification_permission_ui_state.cc - Chromium Code Search
THOR5
-
- install_worker.cc - Chromium Code Search
-
- setup_util.cc - Chromium Code Search
-
- chrome_content_browser_client.cc - Chromium Code Search
-
- omnibox_view.cc - Chromium Code Search
-
- about_flags.cc - Chromium Code Search
-
- browser_commands.cc - Chromium Code Search
-
- offline_page_model.cc - Chromium Code Search
-
- url_schemes.cc - Chromium Code Search
-
- url_utils.cc - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- examples_window.cc - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- build.py - Chromium Code Search
-
- configure.ac - Chromium Code Search
-
- build_ffmpeg.py - Chromium Code Search
-
- bookmark_utils.cc - Chromium Code Search
+
- install_worker.cc - Chromium Code Search
+
- setup_util.cc - Chromium Code Search
+
- chrome_content_browser_client.cc - Chromium Code Search
+
- omnibox_view.cc - Chromium Code Search
+
- about_flags.cc - Chromium Code Search
+
- browser_commands.cc - Chromium Code Search
+
- offline_page_model.cc - Chromium Code Search
+
- url_schemes.cc - Chromium Code Search
+
- url_utils.cc - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- examples_window.cc - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- build.py - Chromium Code Search
+
- configure.ac - Chromium Code Search
+
- build_ffmpeg.py - Chromium Code Search
+
- bookmark_utils.cc - Chromium Code Search
- BUILD.gn - Chromium Code Search
-
- runtime_enabled_features.json5 - Chromium Code Search
-
- audio_context.cc - Chromium Code Search
-
- images - Chromium Code Search
-
- chromeos_strings.grd - Chromium Code Search
+
- runtime_enabled_features.json5 - Chromium Code Search
+
- audio_context.cc - Chromium Code Search
+
- images - Chromium Code Search
+
- chromeos_strings.grd - Chromium Code Search
QUARANTINE_PATCH
-
- base_file.cc - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- toolbar_view.cc - Chromium Code Search
-
- pepper_file_io_host.cc - Chromium Code Search
-
- pepper_file_io_host.h - Chromium Code Search
-
- file_system_access_safe_move_helper.cc - Chromium Code Search
-
- file_system_access_safe_move_helper.h - Chromium Code Search
-
- chrome_location_bar_model_delegate.cc - Chromium Code Search
-
- app_menu_model.cc - Chromium Code Search
-
- os_crypt_win.cc - Chromium Code Search
-
- os_crypt_linux.cc - Chromium Code Search
-
- dpapi_key_provider.cc - Chromium Code Search
-
- machine_id_provider_nonwin.cc - Chromium Code Search
-
- machine_id_provider_win.cc - Chromium Code Search
-
- device_id_win.cc - Chromium Code Search
-
- tracked_split_preference.cc - Chromium Code Search
-
- accelerator_table.cc - Chromium Code Search
-
- browser.cc - Chromium Code Search
-
- browser.h - Chromium Code Search
+
- base_file.cc - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- toolbar_view.cc - Chromium Code Search
+
- pepper_file_io_host.cc - Chromium Code Search
+
- pepper_file_io_host.h - Chromium Code Search
+
- file_system_access_safe_move_helper.cc - Chromium Code Search
+
- file_system_access_safe_move_helper.h - Chromium Code Search
+
- chrome_location_bar_model_delegate.cc - Chromium Code Search
+
- app_menu_model.cc - Chromium Code Search
+
- os_crypt_win.cc - Chromium Code Search
+
- os_crypt_linux.cc - Chromium Code Search
+
- dpapi_key_provider.cc - Chromium Code Search
+
- machine_id_provider_nonwin.cc - Chromium Code Search
+
- machine_id_provider_win.cc - Chromium Code Search
+
- device_id_win.cc - Chromium Code Search
+
- tracked_split_preference.cc - Chromium Code Search
+
- accelerator_table.cc - Chromium Code Search
+
- browser.cc - Chromium Code Search
+
- browser.h - Chromium Code Search
Android
-
- java - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- chrome_public_apk_tmpl.gni - Chromium Code Search
-
- android_chrome_strings.grd - Chromium Code Search
-
- native_theme_gtk.cc - Chromium Code Search
-
- about_version.html - Chromium Code Search
-
- supported_types.cc - Chromium Code Search
-
- variations_service.cc - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- media_options.gni - Chromium Code Search
-
- ignores.txt - Chromium Code Search
+
- java - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- chrome_public_apk_tmpl.gni - Chromium Code Search
+
- android_chrome_strings.grd - Chromium Code Search
+
- native_theme_gtk.cc - Chromium Code Search
+
- about_version.html - Chromium Code Search
+
- supported_types.cc - Chromium Code Search
+
- variations_service.cc - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- media_options.gni - Chromium Code Search
+
- ignores.txt - Chromium Code Search
Th24
-
- tab.cc - Chromium Code Search
-
- tab.h - Chromium Code Search
-
- tab_strip.cc - Chromium Code Search
-
- tab_style_views.cc - Chromium Code Search
-
- tab_style_views.h - Chromium Code Search
-
- tab_strip_model.cc - Chromium Code Search
-
- tab_strip_model.h - Chromium Code Search
-
- history_backend.cc - Chromium Code Search
-
- browser_root_view.h - Chromium Code Search
-
- browser_root_view.cc - Chromium Code Search
-
- new_tab_page_feed_v2_expandable_header.xml - Chromium Code Search
-
- new_tab_page_multi_feed_header.xml - Chromium Code Search
-
- pref_names.cc - Chromium Code Search
-
- theme_helper_win.cc - Chromium Code Search
-
- obsolete_system_linux.cc - Chromium Code Search
-
- insecure_download_blocking.cc - Chromium Code Search
-
- download_target_determiner.cc - Chromium Code Search
-
- feature_promo_controller.cc - Chromium Code Search
-
- gpu_pre_sandbox_hook_linux.cc - Chromium Code Search
-
- download_bubble_prefs.cc - Chromium Code Search
-
- accelerators.cc - Chromium Code Search
-
- whats_new_util.cc - Chromium Code Search
-
- chrome_download_manager_delegate.cc - Chromium Code Search
-
- libaom - Chromium Code Search
-
- libvpx - Chromium Code Search
-
- xnnpack - Chromium Code Search
-
- extension_prefs.cc - Chromium Code Search
-
- extension.cc - Chromium Code Search
-
- tab_strip_prefs.cc - Chromium Code Search
+
- tab.cc - Chromium Code Search
+
- tab.h - Chromium Code Search
+
- tab_strip.cc - Chromium Code Search
+
- tab_style_views.cc - Chromium Code Search
+
- tab_style_views.h - Chromium Code Search
+
- tab_strip_model.cc - Chromium Code Search
+
- tab_strip_model.h - Chromium Code Search
+
- history_backend.cc - Chromium Code Search
+
- browser_root_view.h - Chromium Code Search
+
- browser_root_view.cc - Chromium Code Search
+
- new_tab_page_feed_v2_expandable_header.xml - Chromium Code Search
+
- new_tab_page_multi_feed_header.xml - Chromium Code Search
+
- pref_names.cc - Chromium Code Search
+
- theme_helper_win.cc - Chromium Code Search
+
- obsolete_system_linux.cc - Chromium Code Search
+
- insecure_download_blocking.cc - Chromium Code Search
+
- download_target_determiner.cc - Chromium Code Search
+
- feature_promo_controller.cc - Chromium Code Search
+
- gpu_pre_sandbox_hook_linux.cc - Chromium Code Search
+
- download_bubble_prefs.cc - Chromium Code Search
+
- accelerators.cc - Chromium Code Search
+
- whats_new_util.cc - Chromium Code Search
+
- chrome_download_manager_delegate.cc - Chromium Code Search
+
- libaom - Chromium Code Search
+
- libvpx - Chromium Code Search
+
- xnnpack - Chromium Code Search
+
- extension_prefs.cc - Chromium Code Search
+
- extension.cc - Chromium Code Search
+
- tab_strip_prefs.cc - Chromium Code Search
VectorIcons
-
- BUILD.gn - Chromium Code Search
-
- BUILD.gn - Chromium Code Search
-
- browser_app_menu_button.cc - Chromium Code Search
-
- chrome_labs_button.cc - Chromium Code Search
-
- home_button.cc - Chromium Code Search
-
- side_panel_toolbar_button.cc - Chromium Code Search
-
- ui_base_features.cc - Chromium Code Search
-
- ui_base_features.h - Chromium Code Search
-
- extension_management_internal.h - Chromium Code Search
-
- allowlist.cc - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- BUILD.gn - Chromium Code Search
+
- browser_app_menu_button.cc - Chromium Code Search
+
- chrome_labs_button.cc - Chromium Code Search
+
- home_button.cc - Chromium Code Search
+
- side_panel_toolbar_button.cc - Chromium Code Search
+
- ui_base_features.cc - Chromium Code Search
+
- ui_base_features.h - Chromium Code Search
+
- extension_management_internal.h - Chromium Code Search
+
- allowlist.cc - Chromium Code Search
Chromium Code Search
diff --git a/infra/portable/THORIUM_SHELL.BAT b/infra/portable/THORIUM_SHELL.BAT
index 80cf5d22..4dd2f16b 100644
--- a/infra/portable/THORIUM_SHELL.BAT
+++ b/infra/portable/THORIUM_SHELL.BAT
@@ -1 +1 @@
-START "" "%cd%\BIN\130.0.6723.170\thorium_shell.exe" --user-data-dir="%~dp0%\USER_DATA\thorium_shell" --allow-outdated-plugins --disable-logging --disable-breakpad --enable-experimental-web-platform-features --disable-encryption --disable-machine-id
+START "" "%cd%\BIN\130.0.6723.174\thorium_shell.exe" --user-data-dir="%~dp0%\USER_DATA\thorium_shell" --allow-outdated-plugins --disable-logging --disable-breakpad --enable-experimental-web-platform-features --disable-encryption --disable-machine-id
diff --git a/src/chrome/installer/mini_installer/BUILD.gn b/src/chrome/installer/mini_installer/BUILD.gn
index 1d77bbb8..c348cfb1 100644
--- a/src/chrome/installer/mini_installer/BUILD.gn
+++ b/src/chrome/installer/mini_installer/BUILD.gn
@@ -41,7 +41,7 @@ config("mini_installer_compiler_flags") {
if (!use_sse3 && use_sse2) {
cflags += [ "/arch:SSE2", ]
- if (!use_avx && use_sse3) {
+ } else if (!use_avx && use_sse3) {
cflags += [ "/clang:-msse3", ]
} else if (!use_avx && use_sse41) {
cflags += [ "/clang:-mssse3", "/clang:-msse4.1", ]
@@ -283,7 +283,7 @@ source_set("mini_installer_sources") {
# Generates a mini_installer executable containing the resources provided in the
# caller's `rc_file`.
template("generate_mini_installer") {
- executable(invoker.filename) {
+ executable(target_name) {
sources = [ invoker.rc_file ]
# This target is special so we manually override most linker flags and
@@ -336,29 +336,71 @@ template("generate_mini_installer") {
}
}
-generate_mini_installer("mini_installer") {
- rc_file = packed_files_rc_file
- if (use_sse2) {
- filename = "thorium_WIN32_SSE2_mini_installer"
- } else if (use_sse3) {
- if (current_cpu == "x86") {
- filename = "thorium_WIN32_SSE3_mini_installer"
- } else {
- filename = "thorium_SSE3_mini_installer"
- }
- } else if (use_sse41) {
- filename = "thorium_SSE4_mini_installer"
- } else if (use_sse42) {
- filename = "thorium_SSE4.2_mini_installer"
- } else if (use_avx) {
- filename = "thorium_AVX_mini_installer"
- } else if (use_avx2) {
- filename = "thorium_AVX2_mini_installer"
- } else if (use_avx512) {
- filename = "thorium_AVX512_mini_installer"
- } else {
- filename = "thorium_mini_installer"
+group("mini_installer") {
+ deps = []
+ if (use_sse2 && !use_sse3) {
+ deps += [ ":thorium_WIN32_SSE2_mini_installer" ]
}
+ if (use_sse3 && !use_sse41 && !use_sse42) {
+ if (current_cpu == "x86") {
+ deps += [ ":thorium_WIN32_SSE2_mini_installer" ]
+ } else {
+ deps += [ ":thorium_SSE3_mini_installer" ]
+ }
+ }
+ if (use_sse41 && !use_sse42) {
+ deps += [ ":thorium_SSE4_mini_installer" ]
+ }
+ if (use_sse42 && !use_avx) {
+ deps += [ ":thorium_SSE4.2_mini_installer" ]
+ }
+ if (use_avx && !use_avx2) {
+ deps += [ ":thorium_AVX_mini_installer" ]
+ }
+ if (use_avx2 && !use_avx512) {
+ deps += [":thorium_AVX2_mini_installer" ]
+ }
+ if (use_avx512) {
+ deps += [ ":thorium_AVX512_mini_installer" ]
+ } else {
+ deps += [ ":thorium_mini_installer" ]
+ }
+}
+
+generate_mini_installer("thorium_WIN32_SSE2_mini_installer") {
+ rc_file = packed_files_rc_file
+}
+
+generate_mini_installer("thorium_WIN32_SSE3_mini_installer") {
+ rc_file = packed_files_rc_file
+}
+
+generate_mini_installer("thorium_SSE3_mini_installer") {
+ rc_file = packed_files_rc_file
+}
+
+generate_mini_installer("thorium_SSE4_mini_installer") {
+ rc_file = packed_files_rc_file
+}
+
+generate_mini_installer("thorium_SSE4.2_mini_installer") {
+ rc_file = packed_files_rc_file
+}
+
+generate_mini_installer("thorium_AVX_mini_installer") {
+ rc_file = packed_files_rc_file
+}
+
+generate_mini_installer("thorium_AVX2_mini_installer") {
+ rc_file = packed_files_rc_file
+}
+
+generate_mini_installer("thorium_AVX512_mini_installer") {
+ rc_file = packed_files_rc_file
+}
+
+generate_mini_installer("thorium_mini_installer") {
+ rc_file = packed_files_rc_file
}
if (enable_uncompressed_archive) {
diff --git a/thorium-libjxl b/thorium-libjxl
index 39ce9334..d2ec9890 160000
--- a/thorium-libjxl
+++ b/thorium-libjxl
@@ -1 +1 @@
-Subproject commit 39ce933478589172925969fd1aac9ef1aa5efd23
+Subproject commit d2ec98908ef8011d89be1b42ec18c052c3fd4b9a
diff --git a/upstream_version.sh b/upstream_version.sh
index 35b9bcc8..48800442 100755
--- a/upstream_version.sh
+++ b/upstream_version.sh
@@ -36,7 +36,7 @@ else
export CR_SRC_DIR
fi
-CR_VER="130.0.6723.170"
+CR_VER="130.0.6723.174"
export CR_VER &&
diff --git a/version.sh b/version.sh
index 7178aa3f..047373ac 100755
--- a/version.sh
+++ b/version.sh
@@ -36,7 +36,7 @@ else
export CR_SRC_DIR
fi
-THOR_VER="130.0.6723.170"
+THOR_VER="130.0.6723.174"
export THOR_VER &&
