From 71ead0171b412a4dde2391481ac559520c39b866 Mon Sep 17 00:00:00 2001
From: Zach Anderson <zra@google.com>
Date: Thu, 11 Apr 2024 13:03:39 -0700
Subject: [PATCH] Updates reclient, libpng, and zlib

---
 DEPS                                          |   9 ++-
 .../flutter/third_party/libwebp/BUILD.gn      |   2 +-
 .../third_party/cpu_features/BUILD.gn         |   7 ++
 .../common/fixtures/shelltest_screenshot.png  | Bin 319 -> 319 bytes
 third_party/cpu_features/BUILD.gn             |  61 ++++++++++++++++++
 5 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 build/secondary/third_party/cpu_features/BUILD.gn
 create mode 100644 third_party/cpu_features/BUILD.gn

diff --git a/DEPS b/DEPS
index bc15592f787e4..aeeae280abfa1 100644
--- a/DEPS
+++ b/DEPS
@@ -50,7 +50,7 @@ vars = {
   # https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/goma/client
   'goma_version': ' git_revision:41b3bcb64014144a844153fd5588c36411fffb56',
 
-  'reclient_version': 'git_revision:f61c232b70bc425f0b562480312b114c444d460d',
+  'reclient_version': 'git_revision:2c9285bdffcfd1b21afb028d57494ff78761af81',
 
   'gcloud_version': 'version:2@444.0.0.chromium.3',
 
@@ -656,7 +656,7 @@ deps = {
    Var('flutter_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
 
   'src/flutter/third_party/libpng':
-   Var('flutter_git') + '/third_party/libpng' + '@' + '9187b6e12756317f6d44fc669ac11dfc262bd192',
+   Var('flutter_git') + '/third_party/libpng' + '@' + 'de36b892e921c684ef718fec24739ae9bb49c977',
 
   'src/flutter/third_party/libwebp':
    Var('chromium_git') + '/webm/libwebp.git' + '@' + 'ca332209cb5567c9b249c86788cb2dbf8847e760', # 1.3.2
@@ -665,7 +665,10 @@ deps = {
    Var('skia_git') + '/external/github.com/google/wuffs-mirror-release-c.git' + '@' + '600cd96cf47788ee3a74b40a6028b035c9fd6a61',
 
   'src/third_party/zlib':
-   Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
+   Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + '7d77fb7fd66d8a5640618ad32c71fdeb7d3e02df',
+
+  'src/flutter/third_party/cpu_features/src':
+   Var('chromium_git') + '/external/github.com/google/cpu_features.git' + '@' + '936b9ab5515dead115606559502e3864958f7f6e',
 
   'src/flutter/third_party/inja':
    Var('flutter_git') + '/third_party/inja' + '@' + '88bd6112575a80d004e551c98cf956f88ff4d445',
diff --git a/build/secondary/flutter/third_party/libwebp/BUILD.gn b/build/secondary/flutter/third_party/libwebp/BUILD.gn
index 5753b66b8d866..0ef2e8260ada3 100644
--- a/build/secondary/flutter/third_party/libwebp/BUILD.gn
+++ b/build/secondary/flutter/third_party/libwebp/BUILD.gn
@@ -53,7 +53,7 @@ source_set("libwebp") {
   deps = [ ":libwebp_sse41" ]
 
   if (is_android) {
-    deps += [ "//third_party/cpu-features" ]
+    deps += [ "//third_party/cpu_features:ndk_compat" ]
   }
 
   configs += [ ":libwebp_defines" ]
diff --git a/build/secondary/third_party/cpu_features/BUILD.gn b/build/secondary/third_party/cpu_features/BUILD.gn
new file mode 100644
index 0000000000000..bd1cae17e271d
--- /dev/null
+++ b/build/secondary/third_party/cpu_features/BUILD.gn
@@ -0,0 +1,7 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+group("ndk_compat") {
+  public_deps = [ "//flutter/third_party/cpu_features:ndk_compat" ]
+}
diff --git a/shell/common/fixtures/shelltest_screenshot.png b/shell/common/fixtures/shelltest_screenshot.png
index 3ad7d7e01512a3167df9bd041df566959284441a..26f5b38f102b4f2621bf27d7e8dca5438ed87364 100644
GIT binary patch
delta 52
zcmdnbw4Z50Hup`<|J&mJ{j#!e)t@+V@+3xSX%+?sh6fjU4dj^?Xvj#<1M(O=UHx3v
IIVCg!03DtY;{X5v

delta 52
zcmdnbw4Z50Hup)z`t5Q5ep%VJ<WHP9c@m?vGz$X*!-I>w2J%b`asrz<fjkCJS3j3^
HP6<r_5#$lo

diff --git a/third_party/cpu_features/BUILD.gn b/third_party/cpu_features/BUILD.gn
new file mode 100644
index 0000000000000..45e51b32f23cc
--- /dev/null
+++ b/third_party/cpu_features/BUILD.gn
@@ -0,0 +1,61 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+config("cpu_features_config") {
+  cflags = [ "-Wno-unused-function" ]
+  defines = [
+    "STACK_LINE_READER_BUFFER_SIZE=1024",
+    "HAVE_STRONG_GETAUXVAL",
+  ]
+  include_dirs = [ "src/include" ]
+}
+
+config("ndk_compat_headers") {
+  include_dirs = [ "src/ndk_compat" ]
+}
+
+source_set("cpuinfo") {
+  sources = [
+    "src/src/copy.inl",
+    "src/src/define_introspection.inl",
+    "src/src/define_introspection_and_hwcaps.inl",
+    "src/src/equals.inl",
+    "src/src/filesystem.c",
+    "src/src/hwcaps.c",
+    "src/src/stack_line_reader.c",
+    "src/src/string_view.c",
+  ]
+  if (current_cpu == "x86" || current_cpu == "x64") {
+    sources += [
+      "src/src/impl_x86__base_implementation.inl",
+      "src/src/impl_x86_freebsd.c",
+      "src/src/impl_x86_linux_or_android.c",
+      "src/src/impl_x86_macos.c",
+      "src/src/impl_x86_windows.c",
+    ]
+  } else if (current_cpu == "arm") {
+    sources += [ "src/src/impl_arm_linux_or_android.c" ]
+  } else if (current_cpu == "arm64") {
+    sources += [ "src/src/impl_aarch64_linux_or_android.c" ]
+  } else if (current_cpu == "mips") {
+    sources += [ "src/src/impl_mips_linux_or_android.c" ]
+  } else if (current_cpu == "ppc") {
+    sources += [ "src/src/impl_ppc_linux.c" ]
+  } else if (current_cpu == "riscv64") {
+    sources += [ "src/src/impl_riscv_linux.c" ]
+  } else {
+    error("Missing definition for architecture: $current_cpu")
+  }
+  configs += [ ":cpu_features_config" ]
+}
+
+source_set("ndk_compat") {
+  sources = [
+    "src/ndk_compat/cpu-features.c",
+    "src/ndk_compat/cpu-features.h",
+  ]
+  configs += [ ":cpu_features_config" ]
+  public_configs = [ ":ndk_compat_headers" ]
+  deps = [ ":cpuinfo" ]
+}