Add uazo's patch to build with use_sysroot=false
This commit is contained in:
parent
d25f76de75
commit
ee3212142b
5 changed files with 31 additions and 5 deletions
|
@ -25,7 +25,7 @@ enable_vr=false
|
|||
exclude_unwind_tables=false
|
||||
ffmpeg_branding="Chrome"
|
||||
icu_use_data_file=true
|
||||
is_cfi=false
|
||||
is_cfi=true
|
||||
is_component_build=false
|
||||
is_debug=false
|
||||
is_official_build=true
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
Disable-third-party-cookies-by-default.patch
|
||||
do-not-hide-.orig-files.patch
|
||||
Do-not-link-with-libatomic.patch
|
||||
do-not-add-suffix-to-package-name.patch
|
||||
exit-on-failure-of-inclusion.patch
|
||||
AV1-codec-support.patch
|
||||
|
|
|
@ -2,6 +2,7 @@ AV1-codec-support.patch
|
|||
exit-on-failure-of-inclusion.patch
|
||||
Reintroduce-override_build_timestamp.patch
|
||||
do-not-hide-.orig-files.patch
|
||||
Do-not-link-with-libatomic.patch
|
||||
do-not-add-suffix-to-package-name.patch
|
||||
Switch-to-fstack-protector-strong.patch
|
||||
Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
|
||||
|
|
|
@ -844,8 +844,8 @@ new file mode 100644
|
|||
+ << next_check_delay << " seconds. ";
|
||||
+
|
||||
+ scheduler_->Schedule(
|
||||
+ base::TimeDelta::FromSeconds(initial_check_delay),
|
||||
+ base::TimeDelta::FromSeconds(next_check_delay),
|
||||
+ base::Seconds(initial_check_delay),
|
||||
+ base::Seconds(next_check_delay),
|
||||
+ base::BindRepeating(&AdBlockUpdaterService::OnDemandScheduledUpdate,
|
||||
+ base::Unretained(this)), base::DoNothing());
|
||||
+}
|
||||
|
@ -866,7 +866,7 @@ new file mode 100644
|
|||
+ if (!last_update_.is_null()) {
|
||||
+ base::TimeDelta delta =
|
||||
+ base::TimeTicks::Now() - last_update_;
|
||||
+ if (delta < base::TimeDelta::FromSeconds(on_demand_check_delay)) {
|
||||
+ if (delta < base::Seconds(on_demand_check_delay)) {
|
||||
+ LOG(INFO) << "AdBlockUpdaterService: update not necessary.";
|
||||
+ return false;
|
||||
+ }
|
||||
|
@ -933,7 +933,7 @@ new file mode 100644
|
|||
+ if (!failed) {
|
||||
+ base::TimeDelta delta =
|
||||
+ base::Time::Now() - min_last_modified;
|
||||
+ if (delta < base::TimeDelta::FromSeconds(on_demand_check_delay)) {
|
||||
+ if (delta < base::Seconds(on_demand_check_delay)) {
|
||||
+ LOG(INFO) << "AdBlockUpdaterService: update check not yet needed.";
|
||||
+ is_updating_ = false;
|
||||
+ return false;
|
||||
|
|
24
build/patches/Do-not-link-with-libatomic.patch
Normal file
24
build/patches/Do-not-link-with-libatomic.patch
Normal file
|
@ -0,0 +1,24 @@
|
|||
From: uazo <uazo@users.noreply.github.com>
|
||||
Date: Tue, 11 Jan 2022 13:59:32 +0000
|
||||
Subject: Do not link with libatomic
|
||||
|
||||
Compiler has built-in support thus libatomic linking is no more needed
|
||||
This patch allows building with use_sysroot=false
|
||||
---
|
||||
base/BUILD.gn | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/base/BUILD.gn b/base/BUILD.gn
|
||||
--- a/base/BUILD.gn
|
||||
+++ b/base/BUILD.gn
|
||||
@@ -1393,7 +1393,7 @@ component("base") {
|
||||
if (!use_sysroot &&
|
||||
(is_android || ((is_linux || is_chromeos) && !is_chromecast)) &&
|
||||
host_toolchain != "//build/toolchain/cros:host") {
|
||||
- libs += [ "atomic" ]
|
||||
+ #libs += [ "atomic" ]
|
||||
}
|
||||
|
||||
if (use_allocator_shim) {
|
||||
--
|
||||
2.25.1
|
Loading…
Add table
Reference in a new issue