Update/port to 111.0.5563.49

Author: vanadium-staging

args.gn

@@ -3,11 +3,11 @@ target_os = "android"
 target_cpu = "arm64"
 
 android_channel = "stable"
-android_default_version_name = "110.0.5481.154"
-android_default_version_code = "548115400"
+android_default_version_name = "111.0.5563.49"
+android_default_version_code = "556304900"
 
 ext_version_enabled = true
-ext_version_increment = "1"
+ext_version_increment = "0"
 
 is_component_build = false
 is_debug = false

patches/0001-disable-checkout_nacl.patch

@@ -1,4 +1,4 @@
-From db58cc9f518461ee70ff6169a209d995c917af55 Mon Sep 17 00:00:00 2001
+From f103de04a0ccfd22609505ce97891e93a35a3fb0 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Sat, 21 Nov 2020 01:30:06 -0500
 Subject: [PATCH] disable checkout_nacl
@@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index d77e8d6369c0c..3e188b894470c 100644
+index 8b0dcdd4bbaa7..aace5f6a7a273 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -110,7 +110,7 @@ vars = {

patches/0002-use-64-bit-WebView-processes.patch

@@ -1,4 +1,4 @@
-From 02cd3f249941d5354f03c26f4a547721f01b7aef Mon Sep 17 00:00:00 2001
+From 8500611e88acb8e9a8736709c3b0fb579fae65c2 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Thu, 26 Jan 2017 01:30:12 -0500
 Subject: [PATCH] use 64-bit WebView processes

patches/0003-switch-to-fstack-protector-strong.patch

@@ -1,4 +1,4 @@
-From 56be391bc3337b612867c6de929cfeb70a4a8075 Mon Sep 17 00:00:00 2001
+From 8c11c89496f7581ea342cce8f5a9ea0fbd7390d3 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 26 Dec 2018 10:20:24 -0500
 Subject: [PATCH] switch to -fstack-protector-strong
@@ -8,10 +8,10 @@ Subject: [PATCH] switch to -fstack-protector-strong
  1 file changed, 1 insertion(+), 7 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 944a039d066f6..70e6edbf9735e 100644
+index ef3285ae74e1b..7e4e7a8a218d8 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -319,18 +319,12 @@ config("compiler") {
+@@ -327,18 +327,12 @@ config("compiler") {
          cflags += [ "-fstack-protector" ]
        }
      } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {

patches/0004-enable-fwrapv-in-Clang-for-non-UBSan-builds.patch

@@ -1,4 +1,4 @@
-From 8e0c0b78a86cdd29cb4ea8e364367eb084436236 Mon Sep 17 00:00:00 2001
+From cd5a10fd22a962d980a0397cdd3f8ee08d4c1a10 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Thu, 22 Dec 2016 07:15:34 -0500
 Subject: [PATCH] enable -fwrapv in Clang for non-UBSan builds
@@ -8,10 +8,10 @@ Subject: [PATCH] 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 70e6edbf9735e..491336930c5b0 100644
+index 7e4e7a8a218d8..77a1b32b1b3c0 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -335,6 +335,10 @@ config("compiler") {
+@@ -343,6 +343,10 @@ config("compiler") {
        }
      }
 

patches/0005-enable-ftrivial-auto-var-init-zero.patch

@@ -1,4 +1,4 @@
-From 68893602b364115cabdba90f6df63d52901c1806 Mon Sep 17 00:00:00 2001
+From f622193468207fba84a39099c0214478fd79c504 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 8 Apr 2020 20:48:17 -0400
 Subject: [PATCH] enable -ftrivial-auto-var-init=zero
@@ -8,10 +8,10 @@ Subject: [PATCH] enable -ftrivial-auto-var-init=zero
  1 file changed, 4 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 491336930c5b0..0a9cfa326f1e7 100644
+index 77a1b32b1b3c0..ed566b00b952b 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -339,6 +339,10 @@ config("compiler") {
+@@ -347,6 +347,10 @@ config("compiler") {
        cflags += [ "-fwrapv" ]
      }
 

patches/0006-disable-broken-warning-for-auto-var-init.patch

@@ -1,4 +1,4 @@
-From 924b87bc97fb1b5c0526d37a6c31638b5291847d Mon Sep 17 00:00:00 2001
+From b7a7e45c09e20f8bd3aa9f7400abc0fe76468683 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Thu, 21 May 2020 14:07:54 -0400
 Subject: [PATCH] disable broken warning for auto var init
@@ -8,10 +8,10 @@ Subject: [PATCH] disable broken warning for auto var init
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 0a9cfa326f1e7..70910cee3967a 100644
+index ed566b00b952b..e6477bec6425d 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -340,7 +340,7 @@ config("compiler") {
+@@ -348,7 +348,7 @@ config("compiler") {
      }
 
      if (is_clang) {

patches/0007-Vanadium-branding.patch

@@ -1,4 +1,4 @@
-From 315d67ac6972dc75ec297d97cd2399d9d684f1e3 Mon Sep 17 00:00:00 2001
+From 9612bfe5d038c990d29af381788712c96e29b23c Mon Sep 17 00:00:00 2001
 From: fgei <fgei@gmail.com>
 Date: Tue, 19 Oct 2021 02:21:18 +0000
 Subject: [PATCH] Vanadium branding
@@ -67,10 +67,10 @@ Current incantation of the recolor command:
  create mode 100644 chrome/android/java/res_vanadium_base/values/channel_constants.xml
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index bf0643229638a..64e1be0d0514f 100644
+index 73cde65137ccb..9e74ba01e1d3f 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -220,24 +220,24 @@ if (current_toolchain == default_toolchain) {
+@@ -205,24 +205,24 @@ if (current_toolchain == default_toolchain) {
        "java/res_base/values/ic_launcher_round_alias.xml",
        "java/res_base/values/values.xml",
        "java/res_base/xml/network_security_config.xml",
@@ -113,7 +113,7 @@ index bf0643229638a..64e1be0d0514f 100644
      ]
    }
 
-@@ -245,16 +245,16 @@ if (current_toolchain == default_toolchain) {
+@@ -230,16 +230,16 @@ if (current_toolchain == default_toolchain) {
      sources = chrome_java_resources
      sources += [
        "//chrome/android/java/res_app/layout/main.xml",
@@ -140,7 +140,7 @@ index bf0643229638a..64e1be0d0514f 100644
      ]
 
      deps = [
-@@ -2049,16 +2049,16 @@ if (current_toolchain == default_toolchain) {
+@@ -2034,16 +2034,16 @@ if (current_toolchain == default_toolchain) {
    android_resources("chrome_public_apk_resources") {
      resource_overlay = true
      sources = [
@@ -167,7 +167,7 @@ index bf0643229638a..64e1be0d0514f 100644
      ]
 
      # Dep needed to ensure override works properly.
-@@ -2069,24 +2069,24 @@ if (current_toolchain == default_toolchain) {
+@@ -2054,24 +2054,24 @@ if (current_toolchain == default_toolchain) {
    android_resources("chrome_public_apk_base_module_resources") {
      resource_overlay = true
      sources = [

patches/0008-Vanadium-branding-for-WebView.patch

@@ -1,4 +1,4 @@
-From 5ac398d768687490a2ae72d98e7393c5a3321711 Mon Sep 17 00:00:00 2001
+From dc4369338825e422866939477824e33beb0dd0e6 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Sun, 16 Feb 2020 13:40:14 -0500
 Subject: [PATCH] Vanadium branding for WebView