Port to 80.0.3987.87

0001-use-64-bit-WebView-processes.patch

@@ -1,24 +1,24 @@
-From b0bf179dae6f1761b288336394a1ef7aa79b44ff Mon Sep 17 00:00:00 2001
+From 99a86b0efc8f502804fe632b998ec35e34bab6f0 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Thu, 26 Jan 2017 01:30:12 -0500
 Subject: [PATCH 01/49] use 64-bit WebView processes
 
 ---
- android_webview/apk/java/AndroidManifest.xml | 1 -
+ android_webview/nonembedded/java/AndroidManifest.xml | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/android_webview/apk/java/AndroidManifest.xml b/android_webview/apk/java/AndroidManifest.xml
-index 4bd637bcdd1d..f4acac1886e7 100644
---- a/android_webview/apk/java/AndroidManifest.xml
-+++ b/android_webview/apk/java/AndroidManifest.xml
-@@ -22,7 +22,6 @@
+diff --git a/android_webview/nonembedded/java/AndroidManifest.xml b/android_webview/nonembedded/java/AndroidManifest.xml
+index c9dea7bfb8c7..c6cdceed002d 100644
+--- a/android_webview/nonembedded/java/AndroidManifest.xml
++++ b/android_webview/nonembedded/java/AndroidManifest.xml
+@@ -25,7 +25,6 @@
                   android:icon="@{{manifest_package|default('com.android.webview')}}:drawable/icon_webview"
-                  android:name="{{ application_name|default('com.android.webview.chromium.WebViewApkApplication') }}"
+                  android:name="{{ application_name|default('org.chromium.android_webview.nonembedded.WebViewApkApplication') }}"
                   android:multiArch="true"
--                 android:use32bitAbi="true"
+-                 {{ use32bitAbi|default('android:use32bitAbi="true"') }}
                   android:extractNativeLibs="{{ trichrome_library is not defined }}">
          {# This part is shared between stand-alone WebView and Monochrome #}
          {% macro common(manifest_package, webview_lib) %}
 -- 
-2.24.0
+2.25.0
 

0002-switch-to-fstack-protector-strong.patch

@@ -1,4 +1,4 @@
-From ca9a93c90cd4b53714b5275bbbe3d326cb20b666 Mon Sep 17 00:00:00 2001
+From 315291167755c4fc00305661eea80ea1bbf58907 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 26 Dec 2018 10:20:24 -0500
 Subject: [PATCH 02/49] switch to -fstack-protector-strong
@@ -8,10 +8,10 @@ Subject: [PATCH 02/49] switch to -fstack-protector-strong
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 93ad68a613b3..4ad2888337d9 100644
+index fbf8335f11ba..63eb5c03701e 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -288,16 +288,12 @@ config("compiler") {
+@@ -293,16 +293,12 @@ config("compiler") {
          cflags += [ "-fstack-protector" ]
        }
      } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {
@@ -30,5 +30,5 @@ index 93ad68a613b3..4ad2888337d9 100644
      }
 
 -- 
-2.24.0
+2.25.0
 

0003-enable-fwrapv-in-Clang-for-non-UBSan-builds.patch

@@ -1,4 +1,4 @@
-From 5362dcaf370b286474fea991cb86940054cae514 Mon Sep 17 00:00:00 2001
+From 22f42dc333da62a1da0854c0499709d9553a5946 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Thu, 22 Dec 2016 07:15:34 -0500
 Subject: [PATCH 03/49] enable -fwrapv in Clang for non-UBSan builds
@@ -8,10 +8,10 @@ Subject: [PATCH 03/49] enable -fwrapv in Clang for non-UBSan builds
  1 file changed, 4 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 4ad2888337d9..8baa7af5680d 100644
+index 63eb5c03701e..e9f7a8cfdfca 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -297,6 +297,10 @@ config("compiler") {
+@@ -302,6 +302,10 @@ config("compiler") {
        }
      }
 
@@ -23,5 +23,5 @@ index 4ad2888337d9..8baa7af5680d 100644
      if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
          !is_mac && !is_ios && current_os != "aix") {
 -- 
-2.24.0
+2.25.0