Merge pull request #394 from teeminus/update

build.py

@@ -182,7 +182,7 @@ def main():
             gnpath = source_tree / 'uc_staging' / 'gn_win'
             gnpath.mkdir(parents=True, exist_ok=True)
             subprocess.run(['git', 'clone', 'https://gn.googlesource.com/gn', str(gnpath)], check=True)
-            subprocess.run(['git', 'reset', '--hard', 'd010e218ca7077928ad7c9e9cc02fe43b5a8a0ad'], cwd=gnpath, check=True)
+            subprocess.run(['git', 'reset', '--hard', '20806f79c6b4ba295274e3a589d85db41a02fdaa'], cwd=gnpath, check=True)
             subprocess.run(['git', 'clean', '-ffdx'], cwd=gnpath, check=True)
             subprocess.run([sys.executable, str(gnpath / 'build' / 'gen.py')], check=True)
             for item in gnpath.iterdir():
@@ -275,7 +275,7 @@ def main():
 
         # Generate version file
         with open(RUST_FLAG_FILE, 'w') as f:
-            f.write('rustc 1.82.0-nightly (612a33f20 2024-07-29)')
+            f.write('rustc 1.83.0-nightly (4ac7bcbaa 2024-09-04)')
             f.write('\n')
 
     if not args.ci or not (source_tree / 'out/Default').exists():

downloads.ini

@@ -21,7 +21,7 @@
 #   `http://prereleases.llvm.org/win-snapshots/LLVM-9.8.7-r123456-win64.exe`
 #   (link derived from [LLVM Snapshot Builds](http://llvm.org/builds/))
 [llvm]
-version = 18.1.8
+version = 19.1.1
 #Uncomment when pre-release version is used.
 #url = https://prereleases.llvm.org/win-snapshots/LLVM-%(version)s-win64.exe
 #Uncomment the below instead when a new enough stable version of LLVM comes around
@@ -113,13 +113,13 @@ strip_leading_dirs=DirectX-Headers-%(version)s
 
 # Rust
 [rust-x64]
-version = 2024-07-30
+version = 2024-09-05
 url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-x86_64-pc-windows-msvc.tar.gz
 download_filename = rust-nightly-%(version)s-x86_64-pc-windows-msvc.tar.gz
 output_path = third_party/rust-toolchain-x64
 strip_leading_dirs=rust-nightly-x86_64-pc-windows-msvc
 [rust-x86]
-version = 2024-07-30
+version = 2024-09-05
 url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-i686-pc-windows-msvc.tar.gz
 download_filename = rust-nightly-%(version)s-i686-pc-windows-msvc.tar.gz
 output_path = third_party/rust-toolchain-x86

patches/inox-patchset/fix-cfi-failures-with-unbundled-libxml.patch

@@ -1,6 +1,6 @@
 --- a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
 +++ b/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
-@@ -148,11 +148,11 @@ class PendingStartElementNSCallback fina
+@@ -149,11 +149,11 @@ class PendingStartElementNSCallback fina
          attribute_count_(attribute_count),
          defaulted_count_(defaulted_count) {
      namespaces_ = static_cast<xmlChar**>(
@@ -14,7 +14,7 @@
      for (int i = 0; i < attribute_count; ++i) {
        // Each attribute has 5 elements in the array:
        // name, prefix, uri, value and an end pointer.
-@@ -167,12 +167,12 @@ class PendingStartElementNSCallback fina
+@@ -168,12 +168,12 @@ class PendingStartElementNSCallback fina
 
    ~PendingStartElementNSCallback() override {
      for (int i = 0; i < namespace_count_ * 2; ++i)
@@ -31,7 +31,7 @@
    }
 
    void Call(XMLDocumentParser* parser) override {
-@@ -220,7 +220,7 @@ class PendingCharactersCallback final
+@@ -221,7 +221,7 @@ class PendingCharactersCallback final
          chars_(xmlStrndup(chars, length)),
          length_(length) {}
 
@@ -40,7 +40,7 @@
 
    void Call(XMLDocumentParser* parser) override {
      parser->Characters(chars_, length_);
-@@ -304,7 +304,7 @@ class PendingErrorCallback final : publi
+@@ -305,7 +305,7 @@ class PendingErrorCallback final : publi
          type_(type),
          message_(xmlStrdup(message)) {}
 
@@ -104,7 +104,7 @@
        fetch_options.initiator_info.name = fetch_initiator_type_names::kXml;
 --- a/third_party/blink/renderer/core/xml/xslt_unicode_sort.cc
 +++ b/third_party/blink/renderer/core/xml/xslt_unicode_sort.cc
-@@ -332,18 +332,18 @@ void XsltUnicodeSortFunction(xsltTransfo
+@@ -335,18 +335,18 @@ void XsltUnicodeSortFunction(xsltTransfo
      comp = static_cast<xsltStylePreComp*>(sorts[j]->psvi);
      if (tempstype[j] == 1) {
        // The data-type needs to be recomputed each time.

patches/ungoogled-chromium/windows/windows-disable-clang-version-check.patch

@@ -1,6 +1,6 @@
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1620,8 +1620,7 @@ config("compiler_deterministic") {
+@@ -1625,8 +1625,7 @@ config("compiler_deterministic") {
  }
 
  config("clang_revision") {

patches/ungoogled-chromium/windows/windows-disable-download-warning-prompt.patch

@@ -1,6 +1,6 @@
 --- a/components/download/internal/common/download_item_impl.cc
 +++ b/components/download/internal/common/download_item_impl.cc
-@@ -2505,7 +2505,7 @@ void DownloadItemImpl::SetDangerType(Dow
+@@ -2494,7 +2494,7 @@ void DownloadItemImpl::SetDangerType(Dow
                           TRACE_EVENT_SCOPE_THREAD, "danger_type",
                           GetDownloadDangerNames(danger_type).c_str());
    }

patches/ungoogled-chromium/windows/windows-disable-event-log.patch

@@ -3,14 +3,22 @@
 
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -380,7 +380,6 @@ static_library("common_lib") {
-     ]
-     deps += [
-       "//chrome/chrome_elf:chrome_elf_main_include",
--      "//chrome/common/win:eventlog_messages",
-       "//components/crash/core/app:crash_export_thunk_include",
+@@ -129,7 +129,6 @@ source_set("request_code_constants") {
+ static_library("common_lib") {
+   visibility = [
+     ":*",
+-    "//chrome/common/win:eventlog_messages",
+   ]
+   sources = [
+     "all_messages.h",
+@@ -380,7 +379,6 @@ static_library("common_lib") {
+       "conflicts/remote_module_watcher_win.cc",
+       "conflicts/remote_module_watcher_win.h",
      ]
+-    deps += [ "//chrome/common/win:eventlog_messages" ]
 
+     public_deps += [
+       "//components/dom_distiller/core",  # Needed by chrome_content_client.cc.
 --- a/chrome/common/logging_chrome.cc
 +++ b/chrome/common/logging_chrome.cc
 @@ -72,7 +72,6 @@

patches/ungoogled-chromium/windows/windows-disable-reorder-fix-linking.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -75,29 +75,6 @@ if (is_win && enable_resource_allowlist_
+@@ -80,29 +80,6 @@ if (is_win && enable_resource_allowlist_
    _chrome_resource_allowlist = "$target_gen_dir/chrome_resource_allowlist.txt"
  }
 
@@ -32,7 +32,7 @@
  # This does not currently work. See crbug.com/1311822.
  # This target exists above chrome and it's main components in the dependency
  # tree as a central place to put assert_no_deps annotations. Since this depends
-@@ -135,10 +112,6 @@ if (!is_android && !is_mac) {
+@@ -140,10 +117,6 @@ if (!is_android && !is_mac) {
      # Windows-only deps are OK because chrome_initial uses initialexe/chrome as
      # the output name for that platform.
      # See crbug.com/1146571.
@@ -43,7 +43,7 @@
    }
 
    template("_chrome_exe") {
-@@ -150,11 +123,7 @@ if (!is_android && !is_mac) {
+@@ -155,11 +128,7 @@ if (!is_android && !is_mac) {
      target(_type, target_name) {
        configs -= [ "//build/config/compiler:thinlto_optimize_default" ]
        configs += [ "//build/config/compiler:thinlto_optimize_max" ]
@@ -58,7 +58,7 @@
        # each platform lists its own files rather than relying on filtering or
 --- a/chrome/test/chromedriver/BUILD.gn
 +++ b/chrome/test/chromedriver/BUILD.gn
-@@ -480,11 +480,6 @@ python_library("chromedriver_py_tests")
+@@ -479,11 +479,6 @@ python_library("chromedriver_py_tests")
    if (is_component_build && is_mac) {
      data_deps += [ "//chrome:chrome_framework" ]
    }

patches/ungoogled-chromium/windows/windows-disable-win-build-output.patch

@@ -61,7 +61,7 @@
 @@ -121,24 +121,6 @@ def main():
          header_contents += sorted(define_block, key=lambda s: s.split()[-1])
        with open(header_file, 'wb') as f:
-         f.write(''.join(header_contents))
+         f.write(b''.join(header_contents))
 -
 -    # mc.exe invocation and post-processing are complete, now compare the output
 -    # in tmp_dir to the checked-in outputs.
@@ -76,8 +76,8 @@
 -        tofile = os.path.join(tmp_dir, f)
 -        print(''.join(
 -            difflib.unified_diff(
--                open(fromfile, 'U').readlines(),
--                open(tofile, 'U').readlines(), fromfile, tofile)))
+-                open(fromfile).readlines(),
+-                open(tofile).readlines(), fromfile, tofile)))
 -      delete_tmp_dir = False
 -      sys.exit(1)
    except subprocess.CalledProcessError as e:

patches/ungoogled-chromium/windows/windows-fix-building-with-prunned-binaries.patch

@@ -1,6 +1,6 @@
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -2908,7 +2908,6 @@ source_set("browser") {
+@@ -2896,7 +2896,6 @@ source_set("browser") {
      deps += [
        "//components/app_launch_prefetch",
        "//content/utility:delegate_data",

patches/ungoogled-chromium/windows/windows-fix-building-with-rust.patch

@@ -1,6 +1,6 @@
 --- a/build/config/clang/BUILD.gn
 +++ b/build/config/clang/BUILD.gn
-@@ -247,8 +247,6 @@ clang_lib("compiler_builtins") {
+@@ -246,8 +246,6 @@ clang_lib("compiler_builtins") {
      } else {
        libname = "ios"
      }

patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch

@@ -17,22 +17,22 @@
        "//build:branding_buildflags",
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -5048,7 +5048,6 @@ std::wstring ChromeContentBrowserClient:
+@@ -5061,7 +5061,6 @@ std::wstring ChromeContentBrowserClient:
  #endif
      case sandbox::mojom::Sandbox::kPrintCompositor:
      case sandbox::mojom::Sandbox::kAudio:
 -    case sandbox::mojom::Sandbox::kScreenAI:
+     case sandbox::mojom::Sandbox::kVideoEffects:
      case sandbox::mojom::Sandbox::kSpeechRecognition:
      case sandbox::mojom::Sandbox::kPdfConversion:
-     case sandbox::mojom::Sandbox::kService:
-@@ -5149,7 +5148,6 @@ bool ChromeContentBrowserClient::PreSpaw
+@@ -5163,7 +5162,6 @@ bool ChromeContentBrowserClient::PreSpaw
  #endif
      case sandbox::mojom::Sandbox::kPrintCompositor:
  #if !BUILDFLAG(IS_ANDROID)
 -    case sandbox::mojom::Sandbox::kScreenAI:
  #endif
+     case sandbox::mojom::Sandbox::kVideoEffects:
      case sandbox::mojom::Sandbox::kAudio:
-     case sandbox::mojom::Sandbox::kOnDeviceModelExecution:
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
 @@ -7,6 +7,7 @@ import("//components/safe_browsing/build

patches/ungoogled-chromium/windows/windows-fix-command-ids.patch

@@ -37,16 +37,7 @@
  // Page-related commands
  #define IDC_BOOKMARK_THIS_TAB           35000
  #define IDC_BOOKMARK_ALL_TABS           35001
-@@ -250,7 +240,7 @@
- #define IDC_CHROME_TIPS                40263
- #define IDC_CHROME_WHATS_NEW           40264
-
--#if BUILDFLAG(IS_CHROMEOS_ASH)
-+#if (0)
- #define IDC_LACROS_DATA_MIGRATION      40265
- #endif
-
-@@ -473,7 +463,7 @@
+@@ -468,7 +458,7 @@
  #define IDC_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 51208
 
  // Context menu items for media toolbar button
@@ -55,7 +46,7 @@
  #define IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 51209
  #endif
  #define IDC_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 51210
-@@ -510,7 +500,7 @@
+@@ -505,7 +495,7 @@
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
 

patches/ungoogled-chromium/windows/windows-fix-licenses-gn-path.patch

@@ -1,6 +1,6 @@
 --- a/tools/licenses/licenses.py
 +++ b/tools/licenses/licenses.py
-@@ -812,7 +812,7 @@ def _GnBinary():
+@@ -811,7 +811,7 @@ def _GnBinary():
    elif sys.platform == 'darwin':
      subdir = 'mac'
    elif sys.platform == 'win32':

patches/ungoogled-chromium/windows/windows-fix-remove-unused-preferences-fields.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -1714,9 +1714,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -1722,9 +1722,6 @@ const PolicyToPreferenceMapEntry kSimple
    { key::kRendererAppContainerEnabled,
      prefs::kRendererAppContainerEnabled,
      base::Value::Type::BOOLEAN },

pruning.list

@@ -105,11 +105,13 @@ chrome/installer/test/data/SETUP.EX_
 chrome/services/cups_proxy/test/data/basic_handshake.bin
 chrome/test/enterprise/e2e/connector/common/demo_agent/agent.zip
 chrome/test/media_router/resources/bigbuck.webm
+chrome/updater/enterprise/win/google/GoogleCloudManagement.adm
 chrome/updater/test/data/ChromiumMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.1.0.0.0/TestSystemMsiInstaller.msi
 chrome/updater/test/data/ChromiumMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.2.0.0.0/TestSystemMsiInstaller.msi
 chrome/updater/test/data/GoogleMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.1.0.0.0/TestSystemMsiInstaller.msi
 chrome/updater/test/data/GoogleMSI/{c28fcf72-bcf2-45c5-8def-31a74ac02012}.2.0.0.0/TestSystemMsiInstaller.msi
 chrome/updater/test/data/ProcmonConfiguration.pmc
+chrome/updater/test/data/enterprise/win/google/test_gold.adm
 chrome/updater/test/data/enterprise/win/google/test_gold.adml
 chrome/updater/test/data/enterprise/win/google/test_gold.admx
 chrome/updater/test/data/selfupdate_test_key.der
@@ -233,6 +235,7 @@ components/test/data/feed/response.binarypb
 components/test/data/history/HistoryNoDuration
 components/test/data/history/HistoryNoSource
 components/test/data/history/History_with_starred
+components/test/data/history_embeddings/fake_search_strings_file
 components/test/data/media_router/common/providers/cast/certificate/testsuite/testsuite1.pb
 components/test/data/omnibox/adder.tflite
 components/test/data/omnibox/on_device_head_test_deep_model.bin
@@ -60555,6 +60558,9 @@ third_party/crashpad/crashpad/snapshot/ios/testdata/crash-6605504629637120
 third_party/crashpad/crashpad/snapshot/ios/testdata/crash-c44acfcbccd8c7a8
 third_party/crashpad/crashpad/util/net/testdata/binary_http_body.dat
 third_party/dawn/test/tint/bug/oss-fuzz/57795.spv
+third_party/dawn/third_party/benchmark_shaders/unity_boat_attack/unity_webgpu_0000017E9E2D81A0.vs.spv
+third_party/dawn/third_party/benchmark_shaders/unity_boat_attack/unity_webgpu_000002778DE78280.cs.spv
+third_party/dawn/third_party/benchmark_shaders/unity_boat_attack/unity_webgpu_000002778F740030.fs.spv
 third_party/dawn/third_party/dxc/projects/dxilconv/test/dxbc2dxil-asm/call2.dxbc
 third_party/dawn/third_party/dxc/projects/dxilconv/test/dxbc2dxil-asm/cs3.dxbc
 third_party/dawn/third_party/dxc/projects/dxilconv/test/dxbc2dxil-asm/cyclecounter.dxbc
@@ -61206,6 +61212,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-images.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-web-font.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/load-simple.json.gz
+third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/loading-dt1.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/mainWasm_profile.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/many-requests.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/missing-process-data.json.gz
@@ -61239,6 +61246,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/rend
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/selector-stats.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/server-timings.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/set-timeout-long-task.json.gz
+third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/shift-attribution.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/simple-js-program.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/slow-interaction-button-click.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/slow-interaction-keydown.json.gz
@@ -67450,10 +67458,10 @@ third_party/quic_trace/src/examples/example.json.gz
 third_party/quic_trace/src/examples/example.qtr
 third_party/r8/custom_d8.jar
 third_party/r8/custom_r8.jar
-third_party/rust/chromium_crates_io/vendor/flate2-1.0.31/examples/hello_world.txt.gz
-third_party/rust/chromium_crates_io/vendor/flate2-1.0.31/tests/corrupt-gz-file.bin
-third_party/rust/chromium_crates_io/vendor/flate2-1.0.31/tests/good-file.gz
-third_party/rust/chromium_crates_io/vendor/flate2-1.0.31/tests/multi.gz
+third_party/rust/chromium_crates_io/vendor/flate2-1.0.33/examples/hello_world.txt.gz
+third_party/rust/chromium_crates_io/vendor/flate2-1.0.33/tests/corrupt-gz-file.bin
+third_party/rust/chromium_crates_io/vendor/flate2-1.0.33/tests/good-file.gz
+third_party/rust/chromium_crates_io/vendor/flate2-1.0.33/tests/multi.gz
 third_party/rust/chromium_crates_io/vendor/regex-1.10.6/testdata/fowler/dat/basic.dat
 third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/crash-7eb3351f0965e5d6c1cb98aa8585949ef96531ff
 third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/crash-8760b19b25d74e3603d4c643e9c7404fdd3631f9
@@ -68108,6 +68116,9 @@ third_party/tflite/src/tensorflow/core/util/tensor_bundle/testdata/old_string_te
 third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two/00000123/saved_model.pb
 third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two/00000123/variables/variables.data-00000-of-00001
 third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two/00000123/variables/variables.index
+third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two_empty_tags/00000123/saved_model.pb
+third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two_empty_tags/00000123/variables/variables.data-00000-of-00001
+third_party/tflite/src/tensorflow/go/testdata/saved_model/half_plus_two_empty_tags/00000123/variables/variables.index
 third_party/tflite/src/tensorflow/lite/delegates/xnnpack/odml_sdpa_composite_gqa.tflite.bin
 third_party/tflite/src/tensorflow/lite/delegates/xnnpack/odml_sdpa_composite_mha.tflite.bin
 third_party/tflite/src/tensorflow/lite/delegates/xnnpack/odml_sdpa_composite_mqa.tflite.bin
@@ -68176,6 +68187,7 @@ third_party/tflite/src/tensorflow/lite/testdata/multi_add_flex.bin
 third_party/tflite/src/tensorflow/lite/testdata/multi_signatures.bin
 third_party/tflite/src/tensorflow/lite/testdata/multi_subgraphs_while.bin
 third_party/tflite/src/tensorflow/lite/testdata/nested_while.bin
+third_party/tflite/src/tensorflow/lite/testdata/no_signatures.bin
 third_party/tflite/src/tensorflow/lite/testdata/no_subgraphs.bin
 third_party/tflite/src/tensorflow/lite/testdata/segment_sum_invalid_buffer.bin
 third_party/tflite/src/tensorflow/lite/testdata/softplus_flex.bin
@@ -68815,7 +68827,6 @@ third_party/win_build_output/mc/base/trace_event/etw_manifest/MSG00001.bin
 third_party/win_build_output/mc/base/trace_event/etw_manifest/chrome_events_winTEMP.BIN
 third_party/win_build_output/mc/chrome/common/win/MSG00409.bin
 third_party/win_build_output/mc/chrome/credential_provider/eventlog/MSG00409.bin
-third_party/win_build_output/mc/remoting/host/win/MSG0000d.bin
 third_party/win_build_output/mc/remoting/host/win/MSG00401.bin
 third_party/win_build_output/mc/remoting/host/win/MSG00402.bin
 third_party/win_build_output/mc/remoting/host/win/MSG00403.bin