From 9e630eb66aaa237401f87a97ee114eef7e1a74cc Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Thu, 25 Jan 2024 15:26:21 -0500
Subject: [PATCH] build: remove unneeded dlls in Windows zip (#41120)

* build: fixup zip manifest check on Windows

* build: remove unused dlls
---
 appveyor-woa.yml  | 7 ++++++-
 appveyor.yml      | 7 ++++++-
 build/args/all.gn | 4 ++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/appveyor-woa.yml b/appveyor-woa.yml
index b3fae14f32..fcb6690424 100644
--- a/appveyor-woa.yml
+++ b/appveyor-woa.yml
@@ -177,7 +177,12 @@ for:
             # built on CI.
             7z a pdb.zip out\Default\*.pdb
           }
-      - python3 electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
+      - ps: |
+          $manifest_file = "electron/script/zip_manifests/dist_zip.win.$env:TARGET_ARCH.manifest"
+          python3 electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip $manifest_file
+          if ($LASTEXITCODE -ne 0) {
+            throw "Zip contains files not listed in the manifest $manifest_file"
+          }
       - ps: |
           cd C:\projects\src
           $missing_artifacts = $false
diff --git a/appveyor.yml b/appveyor.yml
index 661f545a2c..5e4811c363 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -174,7 +174,12 @@ for:
             # built on CI.
             7z a pdb.zip out\Default\*.pdb
           }
-      - python3 electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
+      - ps: |
+          $manifest_file = "electron/script/zip_manifests/dist_zip.win.$env:TARGET_ARCH.manifest"
+          python3 electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip $manifest_file
+          if ($LASTEXITCODE -ne 0) {
+            throw "Zip contains files not listed in the manifest $manifest_file"
+          }
       - ps: |
           cd C:\projects\src
           $missing_artifacts = $false
diff --git a/build/args/all.gn b/build/args/all.gn
index bc448d238e..56589e30b2 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -24,6 +24,10 @@ enable_printing = true
 angle_enable_vulkan_validation_layers = false
 dawn_enable_vulkan_validation_layers = false
 
+# Removes dxc dll's that are only used experimentally.
+# See https://bugs.chromium.org/p/chromium/issues/detail?id=1474897
+dawn_use_built_dxc = false
+
 # These are disabled because they cause the zip manifest to differ between
 # testing and release builds.
 # See https://chromium-review.googlesource.com/c/chromium/src/+/2774898.