summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-components_crash_content_app_BUILD.gn
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2019-04-05 12:01:25 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2019-04-05 12:01:25 +0000
commitd90bf58cf83c548d4ed98f8c6ee55a6b84af0834 (patch)
treee364221b071fc7af079027aa7e6ac3d25435767a /www/chromium/files/patch-components_crash_content_app_BUILD.gn
parentUpdate CMake to latest release, 3.14.1 (diff)
www/chromium: Update to 73.0.3683.86
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
Diffstat (limited to 'www/chromium/files/patch-components_crash_content_app_BUILD.gn')
-rw-r--r--www/chromium/files/patch-components_crash_content_app_BUILD.gn35
1 files changed, 22 insertions, 13 deletions
diff --git a/www/chromium/files/patch-components_crash_content_app_BUILD.gn b/www/chromium/files/patch-components_crash_content_app_BUILD.gn
index f289a62c9280..84201e8fd7e3 100644
--- a/www/chromium/files/patch-components_crash_content_app_BUILD.gn
+++ b/www/chromium/files/patch-components_crash_content_app_BUILD.gn
@@ -1,20 +1,29 @@
---- components/crash/content/app/BUILD.gn.orig 2018-12-03 21:16:48.000000000 +0100
-+++ components/crash/content/app/BUILD.gn 2018-12-13 18:52:20.920947000 +0100
-@@ -36,7 +36,7 @@
+--- components/crash/content/app/BUILD.gn.orig 2019-03-11 22:00:56 UTC
++++ components/crash/content/app/BUILD.gn
+@@ -36,12 +36,12 @@ static_library("app") {
sources += [ "crashpad.cc" ]
}
-- if (is_android || is_linux) {
-+ if (is_android || is_linux && !is_bsd) {
- # Want these files on both Linux and Android.
+- if (is_android || (is_linux && !is_chromeos)) {
++ if (is_android || (is_linux && !is_chromeos && !is_bsd)) {
set_sources_assignment_filter([])
+ sources += [ "crashpad_linux.cc" ]
+ }
+
+- if (is_linux) {
++ if (is_linux && !is_bsd) {
sources += [
-@@ -73,8 +73,6 @@
- "//content/public/common:content_descriptors",
- "//content/public/common:result_codes",
- "//sandbox",
-- "//third_party/breakpad:client",
-- "//third_party/crashpad/crashpad/snapshot",
+ "breakpad_linux.cc",
+ "breakpad_linux.h",
+@@ -79,7 +79,10 @@ static_library("app") {
+ "//third_party/crashpad/crashpad/snapshot",
]
- }
+- if (is_linux) {
++ if (is_bsd) {
++ deps -= [ "//third_party/crashpad/crashpad/snapshot" ]
++ }
++ if (is_linux && !is_bsd) {
+ deps += [ "//third_party/breakpad:client" ]
+ }
+ }