diff --git a/.gitignore b/.gitignore index 90e6cc042..ecce8ac19 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ build/ dmg/ scripts/__pycache__/ -scripts/patches/__pycache__/ \ No newline at end of file +scripts/patches/__pycache__/ +releases/ \ No newline at end of file diff --git a/build.sh b/build.sh index a2fa3e06d..3c321dba8 100755 --- a/build.sh +++ b/build.sh @@ -158,9 +158,9 @@ fi if [ "$should_clean_git" = true ]; then cd "$_src_dir" echo "Running git clean with exclusions for gn and other important tools..." - # don't use -x it removes .gitignore files too + # let's clean only in chrome - git clean -fd chrome/ \ + git clean -fdx chrome/ \ --exclude="third_party/" \ --exclude="build_tools/" \ --exclude="uc_staging/" \ @@ -179,7 +179,7 @@ git checkout tags/$chromium_version echo "Running gclient sync with minimal history..." # Use --no-history to skip git history and --shallow for minimal checkout # These reduce checkout size and time significantly -gclient sync --no-history --shallow +gclient sync -D --no-history --shallow cd "$_root_dir" # Clean up previous build artifacts diff --git a/scripts/flags.macos.debug.gn b/scripts/flags.macos.debug.gn index 1314c1809..be26627c8 100644 --- a/scripts/flags.macos.debug.gn +++ b/scripts/flags.macos.debug.gn @@ -23,16 +23,3 @@ proprietary_codecs=true enable_platform_hevc = true disable_fieldtrial_testing_config=true -# build_with_tflite_lib=false -# clang_use_chrome_plugins=false -# enable_hangout_services_extension=false -# enable_mdns=false -# enable_nacl=false -# enable_remoting=false -# exclude_unwind_tables=true -# treat_warnings_as_errors=false -# safe_browsing_mode=0 -# enable_iterator_debugging=false -# enable_rust=true -# fatal_linker_warnings=false -# use_sysroot=false diff --git a/scripts/flags.macos.release.gn b/scripts/flags.macos.release.gn index 67aba1ab2..272608d5a 100644 --- a/scripts/flags.macos.release.gn +++ b/scripts/flags.macos.release.gn @@ -1,15 +1,18 @@ -# For official build is_debug=false is_component_build=false is_official_build=true symbol_level=0 -is_clang=true -chrome_pgo_phase = 0 +chrome_pgo_phase=0 +enable_rust=true +# Critical build fixes +clang_use_chrome_plugins=false +fatal_linker_warnings=false enable_reading_list=false enable_reporting=false -enable_service_discovery=false +enable_mse_mpeg2ts_stream_parser=true + enable_widevine=true google_api_key="" google_default_client_id="" @@ -18,24 +21,7 @@ use_official_google_api_keys=false use_unofficial_version_number=false enable_updater=false blink_symbol_level=0 -enable_mse_mpeg2ts_stream_parser=true enable_swiftshader=true ffmpeg_branding="Chrome" proprietary_codecs=true enable_platform_hevc = true -disable_fieldtrial_testing_config=true - -# build_with_tflite_lib=false -# clang_use_chrome_plugins=false -# disable_fieldtrial_testing_config=true -# enable_hangout_services_extension=false -# enable_mdns=false -# enable_nacl=false -# enable_remoting=false -# exclude_unwind_tables=true -# treat_warnings_as_errors=false -# safe_browsing_mode=0 # Nithin -- this causes some clang error. -# enable_iterator_debugging=false -# enable_rust=true -# fatal_linker_warnings=false -# use_sysroot=false