specific patches for v97

build/bromite_patches_list.txt

@@ -169,3 +169,5 @@ Disable-privacy-sandbox.patch
 Disable-conversion-measurement-api.patch
 Disable-FLoC.patch
 Restore-offline-indicator-v2-flag.patch
+Fix-build-error-for-v97.patch
+Fix-StartupTabPreloader-crash.patch

build/patches/Fix-StartupTabPreloader-crash.patch

@@ -0,0 +1,35 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Tue, 11 Jan 2022 13:57:10 +0000
+Subject: Fix startup crash from v97
+
+---
+ .../chrome/browser/init/StartupTabPreloader.java   | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java b/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java
+@@ -141,20 +141,6 @@ public class StartupTabPreloader implements ProfileManager.Observer, DestroyObse
+     public void onFirstNavigationCommit() {
+         recordDurationFromLoadDecisionIntoHistogram(
+                 "Android.StartupTabPreloader.LoadDecisionToFirstNavigationCommit");
+-
+-        // We record the metric for navigation start here as well, as we want that metric to be
+-        // recorded only for navigations that result in the first navigation commit startup metric
+-        // being recorded.
+-        if (mLoadDecisionMs == 0) return;
+-        assert mFirstNavigationStartMs > 0;
+-        long triggerpointToFirstNavigationStartMs = mFirstNavigationStartMs - mLoadDecisionMs;
+-
+-        // Note that we don't use recordDurationFromLoadDecisionIntoHistogram() here as first
+-        // navigation start was reached before tab matching occurred.
+-        String suffix = preloadWasViable() ? ".Load" : ".NoLoad";
+-        RecordHistogram.recordMediumTimesHistogram(
+-                "Android.StartupTabPreloader.LoadDecisionToFirstNavigationStart" + suffix,
+-                triggerpointToFirstNavigationStartMs);
+     }
+ 
+     @Override
+-- 
+2.20.1
+

build/patches/Fix-build-error-for-v97.patch

@@ -0,0 +1,23 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Tue, 11 Jan 2022 13:59:32 +0000
+Subject: Fix use_sysroot=false build error
+
+---
+ 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.20.1
+