mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: deprecate apply-patches in favour of git-{import,export}-patches (#15300)

Browse source
This commit is contained in:
Jeremy Apthorp 2018-10-24 11:24:11 -07:00 • committed by GitHub
parent 4185efa08f
commit 335e9f68b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
123 changed files with 4368 additions and 4780 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/common/chromium/resource_file_conflict.patch
View file

@ -1,4 +1,4 @@
From a6b7144643673ce4e04f377f4321a4f750f8ffe4 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <nornagon@nornagon.net>
Date: Thu, 20 Sep 2018 17:48:59 -0700
Subject: resource_file_conflict.patch
@ -9,7 +9,7 @@ paths, but GN throws errors if there are multiple targets that generate the
same files.
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index a47af42a5a5a..db8311121e75 100644
index a47af42a5a5afc1560f11ee0ccfa5fc177745caa..db8311121e755eb955ff05dee61a9706ae747977 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1640,6 +1640,11 @@ if (is_chrome_branded && !is_android) {