fix macos args and mini_installer deps

build_win.sh

@@ -47,6 +47,7 @@ cd ${CR_SRC_DIR} &&
 # For restoring individual build targets for customization
 #autoninja -C out/thorium thorium chromedriver clear_key_cdm thorium_shell policy_templates pack_policy_templates setup mini_installer -j$@ &&
 autoninja -C out/thorium thorium_all -j$@ &&
+autoninja -C out/thorium thorium_all setup mini_installer -j$@ &&
 
 mv -v -f ${CR_SRC_DIR}/out/thorium/mini_installer.exe ${CR_SRC_DIR}/out/thorium/thorium_mini_installer.exe &&
 

infra/DEBUG/mac_ARM_debug_args.gn

@@ -0,0 +1,92 @@
+use_sse3 = false
+use_sse41 = true
+use_sse42 = true
+use_avx = true
+use_avx2 = true
+use_avx512 = false
+use_fma = true
+
+# use_polly = true
+# use_bolt = true
+target_os = "mac"
+target_cpu = "arm64"
+v8_target_cpu = "arm64"
+use_system_xcode = true
+is_official_build = false
+is_debug = true
+# enable_stripping = true
+thin_lto_enable_cache = false
+# dcheck_always_on = false
+# exclude_unwind_tables = true
+# enable_iterator_debugging = false
+disable_fieldtrial_testing_config = true
+enable_reporting = false
+# enable_resource_allowlist_generation = false
+# enable_profiling = false
+is_component_build = true
+symbol_level = 2
+enable_nacl = false
+optimize_webui = true
+enable_webui_tab_strip = false
+# is_clang = true
+treat_warnings_as_errors = false
+# llvm_force_head_revision = true
+# use_lld = true
+# use_icf = true
+# is_cfi = true
+v8_symbol_level = 0
+v8_enable_fast_torque = true
+v8_enable_builtins_optimization = false
+# v8_enable_maglev = true
+# v8_enable_turbofan = true
+# v8_enable_wasm_simd256_revec = true
+# use_v8_context_snapshot = true
+blink_symbol_level = 2
+# enable_precompiled_headers = false
+media_use_ffmpeg = true
+media_use_libvpx = true
+enable_hls_demuxer = true
+enable_ink = false
+enable_discovery = true
+enable_cros_media_app = false
+proprietary_codecs = true
+ffmpeg_branding = "Chrome"
+# Set to false for Polly build
+# clang_use_chrome_plugins = true
+enable_ffmpeg_video_decoders = true
+is_component_ffmpeg = false
+use_webaudio_pffft = false
+enable_library_cdms = true
+enable_widevine = true
+bundle_widevine_cdm = true
+enable_cdm_host_verification = true
+enable_widevine_cdm_host_verification = true
+ignore_missing_widevine_signing_cert = true
+enable_media_drm_storage = true
+enable_hangout_services_extension = false
+rtc_use_h264 = true
+rtc_use_h265 = true
+rtc_include_ilbc = true
+rtc_build_with_neon = true
+rtc_build_examples = false
+# rtc_enable_avx2 = true
+enable_vr = true
+enable_platform_hevc = true
+enable_hevc_parser_and_hw_decoder = true
+platform_has_optional_hevc_support = true
+enable_platform_ac3_eac3_audio = true
+enable_platform_ac4_audio = false
+enable_platform_dolby_vision = true
+enable_platform_encrypted_dolby_vision = true
+enable_platform_mpeg_h_audio = true
+enable_platform_dts_audio = true
+enable_mse_mpeg2ts_stream_parser = true
+use_text_section_splitting = true
+use_thin_lto = false
+thin_lto_enable_optimizations = false
+enable_rust = true
+# enable_all_rust_features = true
+# init_stack_vars_zero = true
+enable_updater = false
+enable_update_notifications = false
+chrome_pgo_phase = 0

infra/DEBUG/mac_x64_debug_args.gn

@@ -0,0 +1,92 @@
+use_sse3 = true
+use_sse41 = true
+use_sse42 = true
+use_avx = true
+use_avx2 = true
+use_avx512 = false
+use_fma = true
+
+# use_polly = true
+# use_bolt = true
+target_os = "mac"
+target_cpu = "x64"
+v8_target_cpu = "x64"
+use_system_xcode = true
+is_official_build = false
+is_debug = true
+# enable_stripping = true
+thin_lto_enable_cache = false
+# dcheck_always_on = false
+# exclude_unwind_tables = true
+# enable_iterator_debugging = false
+disable_fieldtrial_testing_config = true
+enable_reporting = false
+# enable_resource_allowlist_generation = false
+# enable_profiling = false
+is_component_build = true
+symbol_level = 2
+enable_nacl = false
+optimize_webui = true
+enable_webui_tab_strip = false
+# is_clang = true
+treat_warnings_as_errors = false
+# llvm_force_head_revision = true
+# use_lld = true
+# use_icf = true
+# is_cfi = true
+v8_symbol_level = 0
+v8_enable_fast_torque = true
+v8_enable_builtins_optimization = false
+v8_enable_maglev = true
+v8_enable_turbofan = true
+v8_enable_wasm_simd256_revec = true
+# use_v8_context_snapshot = true
+blink_symbol_level = 2
+# enable_precompiled_headers = false
+media_use_ffmpeg = true
+media_use_libvpx = true
+enable_hls_demuxer = true
+enable_ink = false
+enable_discovery = true
+enable_cros_media_app = false
+proprietary_codecs = true
+ffmpeg_branding = "Chrome"
+# Set to false for Polly build
+# clang_use_chrome_plugins = true
+enable_ffmpeg_video_decoders = true
+is_component_ffmpeg = false
+use_webaudio_pffft = false
+enable_library_cdms = true
+enable_widevine = true
+bundle_widevine_cdm = true
+enable_cdm_host_verification = true
+enable_widevine_cdm_host_verification = true
+ignore_missing_widevine_signing_cert = true
+enable_media_drm_storage = true
+enable_hangout_services_extension = false
+rtc_use_h264 = true
+rtc_use_h265 = true
+rtc_include_ilbc = true
+# rtc_build_with_neon = false
+rtc_build_examples = false
+rtc_enable_avx2 = true
+enable_vr = true
+enable_platform_hevc = true
+enable_hevc_parser_and_hw_decoder = true
+platform_has_optional_hevc_support = true
+enable_platform_ac3_eac3_audio = true
+enable_platform_ac4_audio = false
+enable_platform_dolby_vision = true
+enable_platform_encrypted_dolby_vision = true
+enable_platform_mpeg_h_audio = true
+enable_platform_dts_audio = true
+enable_mse_mpeg2ts_stream_parser = true
+use_text_section_splitting = true
+use_thin_lto = false
+thin_lto_enable_optimizations = false
+enable_rust = true
+# enable_all_rust_features = true
+# init_stack_vars_zero = true
+enable_updater = false
+enable_update_notifications = false
+chrome_pgo_phase = 0

other/Mac/mac_ARM_args.gn

@@ -1,35 +1,42 @@
 use_sse3 = false
+use_sse41 = true
+use_sse42 = true
+use_avx = true
+use_avx2 = true
+use_avx512 = false
+use_fma = true
 
 # use_polly = true
+# use_bolt = true
 target_os = "mac"
 target_cpu = "arm64"
-# enable_linux_installer = true
-# enable_distro_version_check = false
+v8_target_cpu = "arm64"
+use_system_xcode = true
 is_official_build = true
 is_debug = false
-enable_stripping = true
+# enable_stripping = true
 thin_lto_enable_cache = false
 # dcheck_always_on = false
 # exclude_unwind_tables = true
 # enable_iterator_debugging = false
-#disable_fieldtrial_testing_config = true
+disable_fieldtrial_testing_config = true
 enable_reporting = false
-enable_resource_allowlist_generation = false
+# enable_resource_allowlist_generation = false
 # enable_profiling = false
-# is_component_build = false
+is_component_build = false
 symbol_level = 0
 enable_nacl = false
-# optimize_webui = true
+optimize_webui = true
 enable_webui_tab_strip = false
 # is_clang = true
 treat_warnings_as_errors = false
 # llvm_force_head_revision = true
 # use_lld = true
-# use_icf = true
+use_icf = true
 # is_cfi = true
 v8_symbol_level = 0
-# v8_enable_fast_torque = true
-# v8_enable_builtins_optimization = true
+v8_enable_fast_torque = true
+v8_enable_builtins_optimization = true
 # v8_enable_maglev = true
 # v8_enable_turbofan = true
 # v8_enable_wasm_simd256_revec = true
@@ -48,15 +55,14 @@ ffmpeg_branding = "Chrome"
 # clang_use_chrome_plugins = true
 enable_ffmpeg_video_decoders = true
 is_component_ffmpeg = false
-use_webaudio_pffft = true
-# use_vaapi = true
+use_webaudio_pffft = false
 enable_library_cdms = true
 enable_widevine = true
-bundle_widevine_cdm = false
-enable_cdm_host_verification = false
+bundle_widevine_cdm = true
+enable_cdm_host_verification = true
+enable_widevine_cdm_host_verification = true
 ignore_missing_widevine_signing_cert = true
 enable_media_drm_storage = true
-# enable_media_overlay = true
 enable_hangout_services_extension = false
 rtc_use_h264 = true
 rtc_use_h265 = true
@@ -75,11 +81,14 @@ enable_platform_encrypted_dolby_vision = true
 enable_platform_mpeg_h_audio = true
 enable_platform_dts_audio = true
 enable_mse_mpeg2ts_stream_parser = true
-# use_text_section_splitting = true
+use_text_section_splitting = true
 use_thin_lto = true
 thin_lto_enable_optimizations = true
 enable_rust = true
-# enable_all_rust_features = false
+# enable_all_rust_features = true
 # init_stack_vars_zero = true
+enable_updater = false
+enable_update_notifications = false
+chrome_pgo_phase = 2
 pgo_data_path = "/Users/midzer/chromium/src/out/thorium/profile/speedometer2.profdata"
 # chrome-mac-arm-6723-1732403664-6b096b117dfedda5f55cd1031be458f9d51fb14d-01471df40b957d1278882145f18381d751cee7da.profdata

other/Mac/mac_args.gn

@@ -14,35 +14,35 @@ v8_target_cpu = "x64"
 use_system_xcode = true
 is_official_build = true
 is_debug = false
-enable_stripping = true
+# enable_stripping = true
 thin_lto_enable_cache = false
-dcheck_always_on = false
-exclude_unwind_tables = true
-enable_iterator_debugging = false
+# dcheck_always_on = false
+# exclude_unwind_tables = true
+# enable_iterator_debugging = false
 disable_fieldtrial_testing_config = true
 enable_reporting = false
-enable_resource_allowlist_generation = false
-enable_profiling = false
+# enable_resource_allowlist_generation = false
+# enable_profiling = false
 is_component_build = false
 symbol_level = 0
 enable_nacl = false
 optimize_webui = true
 enable_webui_tab_strip = false
-is_clang = true
+# is_clang = true
 treat_warnings_as_errors = false
 # llvm_force_head_revision = true
-use_lld = true
+# use_lld = true
 use_icf = true
-is_cfi = true
+# is_cfi = true
 v8_symbol_level = 0
 v8_enable_fast_torque = true
 v8_enable_builtins_optimization = true
 v8_enable_maglev = true
 v8_enable_turbofan = true
 v8_enable_wasm_simd256_revec = true
-use_v8_context_snapshot = true
+# use_v8_context_snapshot = true
 blink_symbol_level = 0
-enable_precompiled_headers = false
+# enable_precompiled_headers = false
 media_use_ffmpeg = true
 media_use_libvpx = true
 enable_hls_demuxer = true
@@ -52,14 +52,15 @@ enable_cros_media_app = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"
 # Set to false for Polly build
-clang_use_chrome_plugins = true
+# clang_use_chrome_plugins = true
 enable_ffmpeg_video_decoders = true
 is_component_ffmpeg = false
 use_webaudio_pffft = false
 enable_library_cdms = true
 enable_widevine = true
 bundle_widevine_cdm = true
-enable_cdm_host_verification = false
+enable_cdm_host_verification = true
+enable_widevine_cdm_host_verification = true
 ignore_missing_widevine_signing_cert = true
 enable_media_drm_storage = true
 enable_hangout_services_extension = false
@@ -84,5 +85,9 @@ use_text_section_splitting = true
 use_thin_lto = true
 thin_lto_enable_optimizations = true
 enable_rust = true
+# enable_all_rust_features = true
+# init_stack_vars_zero = true
+enable_updater = false
+enable_update_notifications = false
 chrome_pgo_phase = 2
 pgo_data_path = "/Users/midzer/chromium/src/out/thorium/profile/chrome-mac-6723-1732295315-8f9cf47a13b24b0713c4f78b2e3985d5d476d89d-74da9411216ab49f72b5ea57c6e907e5cf436f73.profdata"

other/thorium-2024-ui.patch

@@ -1169,7 +1169,7 @@ index 9b189df8d8ffd..7c2ae3a3c94fa 100644
        // Spec says height of button should be 36dp, vertical padding on both
        // top and bottom should be 8dp.
 -      return 36 + 2 * 8;
-+      return features::IsThorium2024() ? 42 : 36 + 2 * 8;
++      return features::IsThorium2024() ? 44 : 36 + 2 * 8;
      case DISTANCE_PERMISSION_PROMPT_HORIZONTAL_ICON_LABEL_PADDING:
        return 8;
      case DISTANCE_RICH_HOVER_BUTTON_ICON_HORIZONTAL:

src/BUILD.gn

@@ -125,12 +125,6 @@ group("thorium_all") {
       "//chrome:chrome_dll",
       "//components/policy:pack_policy_templates"
     ]
-    if (is_official_build) {
-      deps += [
-        "//chrome/installer/mini_installer:mini_installer",
-        "//chrome/installer/setup:setup"
-      ]
-    }
   }
 
   if (is_android) {