Commit 2dc9c857 authored by Jeff Huang's avatar Jeff Huang 🤔

[stable] chromium: fix some patches

parent 08969ebe
Pipeline #113 failed with stages
in 45 minutes and 1 second
...@@ -57,7 +57,7 @@ sha256sums=('342ea80a925d85f5155b2b423a0d3cbcf2ee5729bf107c601d7d902315d03127' ...@@ -57,7 +57,7 @@ sha256sums=('342ea80a925d85f5155b2b423a0d3cbcf2ee5729bf107c601d7d902315d03127'
'a86a8ec67aed5a94557257b9826c5b8fe37005e8376e75986fee77acd066539a' 'a86a8ec67aed5a94557257b9826c5b8fe37005e8376e75986fee77acd066539a'
'c82c830bac7ab328a76d85fb141e150a17d02d97138a6daa4720a8a8c371a402' 'c82c830bac7ab328a76d85fb141e150a17d02d97138a6daa4720a8a8c371a402'
'814eb2cecb10cb697e24036b08aac41e88d0e38971741f9e946200764e2401ae' '814eb2cecb10cb697e24036b08aac41e88d0e38971741f9e946200764e2401ae'
'e53dc6f259acd39df13874f8a0f440528fae764b859dd71447991a5b1fac7c9c' '9478f1ec1a3c53425306cf41c2d0555c215a4f106955d9d6adfff38044530ce8'
'455f0029987d9f0532bd9a5250669af5146a9c2b65b776d4a6e2499e8aca7bb4' '455f0029987d9f0532bd9a5250669af5146a9c2b65b776d4a6e2499e8aca7bb4'
'4495e8b29dae242c79ffe4beefc5171eb3c7aacb7e9aebfd2d4d69b9d8c958d3' '4495e8b29dae242c79ffe4beefc5171eb3c7aacb7e9aebfd2d4d69b9d8c958d3'
'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808') 'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808')
......
From 1fc37227522ccd314f82ec893ed15c6129296604 Mon Sep 17 00:00:00 2001
From: Paul Jensen <pauljensen@chromium.org>
Date: Wed, 11 Oct 2017 08:37:34 -0400
Subject: [PATCH] Move exclude_unwind_tables back into declare_args
There is desire to adjust this flag manually.
BUG=762629
R=thakis@chromium.org
Change-Id: I3bd134c19270cd1f729b3ea078674e734493d4ab
---
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
index ad40fd9..50e19a4 100644 index ad40fd9..50e19a4 100644
--- a/build/config/compiler/compiler.gni --- a/build/config/compiler/compiler.gni
+++ b/build/config/compiler/compiler.gni +++ b/build/config/compiler/compiler.gni
@@ -68,18 +68,18 @@ @@ -68,19 +68,19 @@
# Whether or not we should use position independent code. # Whether or not we should use position independent code.
use_pic = true use_pic = true
...@@ -25,8 +12,9 @@ index ad40fd9..50e19a4 100644 ...@@ -25,8 +12,9 @@ index ad40fd9..50e19a4 100644
+ # server. For unofficial (e.g. development) builds and non-Chrome branded + # server. For unofficial (e.g. development) builds and non-Chrome branded
+ # (e.g. Cronet which doesn't use Crashpad, crbug.com/479283) builds it's + # (e.g. Cronet which doesn't use Crashpad, crbug.com/479283) builds it's
+ # useful to be able to unwind at runtime. + # useful to be able to unwind at runtime.
+ exclude_unwind_tables = (is_chrome_branded && is_official_build) || + exclude_unwind_tables =
+ (is_chromecast && !is_cast_desktop_build && !is_debug) + (is_chrome_branded && is_official_build) ||
+ (is_chromecast && !is_cast_desktop_build && !is_debug && !is_fuchsia)
} }
assert(!is_cfi || use_thin_lto, "CFI requires ThinLTO") assert(!is_cfi || use_thin_lto, "CFI requires ThinLTO")
...@@ -36,8 +24,9 @@ index ad40fd9..50e19a4 100644 ...@@ -36,8 +24,9 @@ index ad40fd9..50e19a4 100644
-# For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet -# For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet
-# which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able -# which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able
-# to unwind at runtime. -# to unwind at runtime.
-exclude_unwind_tables = (is_chrome_branded && is_official_build) || -exclude_unwind_tables =
- (is_chromecast && !is_cast_desktop_build && !is_debug) - (is_chrome_branded && is_official_build) ||
- (is_chromecast && !is_cast_desktop_build && !is_debug && !is_fuchsia)
- -
# If true, optimize for size. Does not affect windows builds. # If true, optimize for size. Does not affect windows builds.
# Linux & Mac favor speed over size. # Linux & Mac favor speed over size.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment