build: make win on arm patches only apply for win on arm builds

electron · Aug 1, 2019 · 0b62702 · 0b62702
1 parent e7116e7
commit 0b62702
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 0 deletions.
diff --git a/DEPS b/DEPS
@@ -31,6 +31,9 @@ vars = {
   # To be able to build clean Chromium from sources.
   'apply_patches': True,
 
+  # Apply the patches specific to windows on arm64
+  'apply_win_arm64_patches': False,
+
   # Python interface to Amazon Web Services. Is used for releases only.
   'checkout_boto': False,
 
@@ -96,6 +99,16 @@ hooks = [
       'src/electron/patches/common/config.json',
     ],
   },
+  {
+    'name': 'patch_chromium',
+    'condition': 'checkout_chromium and apply_patches and apply_win_arm64_patches',
+    'pattern': 'src/electron',
+    'action': [
+      'python',
+      'src/electron/script/apply_all_patches.py',
+      'src/electron/patches/win_arm64/config.json',
+    ],
+  },
   {
     'name': 'electron_external_binaries',
     'pattern': 'src/electron/script/update-external-binaries.py',

diff --git a/patches/win_arm64/chromium/.patches b/patches/win_arm64/chromium/.patches
@@ -0,0 +1 @@
+backport_crashpad_cpu_context_capture.patch
diff --git a/...ckport_crashpad_cpu_context_capture.patch → ...ckport_crashpad_cpu_context_capture.patch b/...ckport_crashpad_cpu_context_capture.patch → ...ckport_crashpad_cpu_context_capture.patch
diff --git a/patches/win_arm64/config.json b/patches/win_arm64/config.json
@@ -0,0 +1,5 @@
+{
+  "src/electron/patches/win_arm64/chromium": "src",
+
+  "src/electron/patches/win_arm64/v8":  "src/v8"
+}
diff --git a/patches/win_arm64/v8/.patches b/patches/win_arm64/v8/.patches
@@ -0,0 +1 @@
+unwind_v8_frames_correctly_on_windows_arm64.patch
diff --git a/...8_frames_correctly_on_windows_arm64.patch → ...8_frames_correctly_on_windows_arm64.patch b/...8_frames_correctly_on_windows_arm64.patch → ...8_frames_correctly_on_windows_arm64.patch