8 files changed, 34 insertions, 201 deletions

diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-fix-musl-build.patch b/meta-oe/recipes-devtools/perfetto/files/0001-fix-musl-build.patch
deleted file mode 100644
index 3b7ca951ae..0000000000
--- a/meta-oe/recipes-devtools/perfetto/files/0001-fix-musl-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 485c21940eb0100a33b7efea40a83e7f79e765f8 Mon Sep 17 00:00:00 2001
-From: Etienne Cordonnier <ecordonnier@snap.com>
-Date: Sun, 22 Sep 2024 20:17:52 +0200
-Subject: [PATCH] fix musl build
-
-Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
----
-Upstream-Status: Pending
-
- sdk/perfetto.cc   | 1 -
- src/base/utils.cc | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/sdk/perfetto.cc b/sdk/perfetto.cc
-index b10dd5aa92..2eb90f0d15 100644
---- a/sdk/perfetto.cc
-+++ b/sdk/perfetto.cc
-@@ -6558,7 +6558,6 @@ std::optional<int32_t> GetTimezoneOffsetMins() {
- 
- #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
--#include <linux/prctl.h>
- #include <sys/prctl.h>
- 
- #ifndef PR_GET_TAGGED_ADDR_CTRL
-diff --git a/src/base/utils.cc b/src/base/utils.cc
-index 0d9318c136..419c7dbc1a 100644
---- a/src/base/utils.cc
-+++ b/src/base/utils.cc
-@@ -40,7 +40,6 @@
- 
- #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
--#include <linux/prctl.h>
- #include <sys/prctl.h>
- 
- #ifndef PR_GET_TAGGED_ADDR_CTRL
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-devtools/perfetto/libperfetto.bb b/meta-oe/recipes-devtools/perfetto/libperfetto.bb
index 8383db3cc0..368d333145 100644
--- a/meta-oe/recipes-devtools/perfetto/libperfetto.bb
+++ b/meta-oe/recipes-devtools/perfetto/libperfetto.bb
@@ -1,5 +1,5 @@
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d2572d98547d43906b53615f856a8c2d"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c0c9924c5c63b4834b8b1959816c8e3b"
 
 require perfetto.inc
 
diff --git a/meta-oe/recipes-devtools/perfetto/libperfetto/0001-meson-add-pc-file-for-lib_perfetto.patch b/meta-oe/recipes-devtools/perfetto/libperfetto/0001-meson-add-pc-file-for-lib_perfetto.patch
index 719663a802..9cfe636152 100644
--- a/meta-oe/recipes-devtools/perfetto/libperfetto/0001-meson-add-pc-file-for-lib_perfetto.patch
+++ b/meta-oe/recipes-devtools/perfetto/libperfetto/0001-meson-add-pc-file-for-lib_perfetto.patch
@@ -18,7 +18,7 @@ index 8fb1e26275..3ef3ebf27d 100644
  project(
      'perfetto',
      ['cpp'],
-+    version: '47.0'
++    version: '51.2'
  )
  
 +soversion = meson.project_version()
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.bb b/meta-oe/recipes-devtools/perfetto/perfetto.bb
index e284ec8d1e..a560c5643c 100644
--- a/meta-oe/recipes-devtools/perfetto/perfetto.bb
+++ b/meta-oe/recipes-devtools/perfetto/perfetto.bb
@@ -1,12 +1,12 @@
 LICENSE = "Apache-2.0 & BSD-3-Clause & MIT & Zlib"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d2572d98547d43906b53615f856a8c2d \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c0c9924c5c63b4834b8b1959816c8e3b \
                     file://buildtools/libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \
                     file://buildtools/libcxxabi/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \
                     file://buildtools/libunwind/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \
                     file://buildtools/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
                     file://buildtools/zlib/LICENSE;md5=8c75f2b4df47a77f9445315a9500cd1c \
-                    file://debian/copyright;md5=4e08364c82141f181de69d0a2b89d612 \
+                    file://debian/copyright;md5=55b18749ff89714316c007d06f305c4a \
                     file://python/LICENSE;md5=c602a632c34ade9c78a976734077bce7"
 
 # Dependencies from perfetto/tools/install-build-deps
@@ -21,14 +21,12 @@ SRC_URI:append = " \
            git://android.googlesource.com/platform/system/libprocinfo.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-libprocinfo;name=libprocinfo \
            git://android.googlesource.com/platform/system/core.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-core;name=core \
            git://android.googlesource.com/platform/bionic.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/bionic;name=bionic \
-           git://android.googlesource.com/platform/external/zlib.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zlib;name=zlib \
+           git://chromium.googlesource.com/chromium/src/third_party/zlib.git;nobranch=1;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zlib;name=zlib \
            git://android.googlesource.com/platform/external/lzma.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/lzma;name=lzma \
            git://android.googlesource.com/platform/external/zstd.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zstd;name=zstd \
            https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/;name=gn \
            \
            file://0001-Remove-check_build_deps-build-steps.patch \
-           file://0002-traced-fix-missing-include.patch \
-           file://0001-add-missing-includes-for-the-build-with-use_libcxx_m.patch \
            "
 
 SRCREV_bionic = "a0d0355105cb9d4a4b5384897448676133d7b8e2"
@@ -42,7 +40,7 @@ SRCREV_libbase = "78f1c2f83e625bdf66d55b48bdb3a301c20d2fb3"
 SRCREV_libcxx = "852bc6746f45add53fec19f3a29280e69e358d44"
 SRCREV_libcxxabi = "a37a3aa431f132b02a58656f13984d51098330a2"
 SRCREV_libunwind = "419b03c0b8f20d6da9ddcb0d661a94a97cdd7dad"
-SRCREV_zlib = "6d3f6aa0f87c9791ca7724c279ef61384f331dfd"
+SRCREV_zlib = "6f9b4e61924021237d474569027cfb8ac7933ee6"
 SRCREV_zstd = "77211fcc5e08c781734a386402ada93d0d18d093"
 
 SRCREV_FORMAT .= "_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib_zstd"
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.inc b/meta-oe/recipes-devtools/perfetto/perfetto.inc
index 1c7e9144cc..5b4a942526 100644
--- a/meta-oe/recipes-devtools/perfetto/perfetto.inc
+++ b/meta-oe/recipes-devtools/perfetto/perfetto.inc
@@ -3,10 +3,8 @@ HOMEPAGE = "https://github.com/google/perfetto"
 
 # Add only patches here which are used by both perfetto and libperfetto
 SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1 \
-           file://0001-fix-musl-build.patch \
         "
 
-SRCREV_perfetto = "c74251226a8caa0b43377902ee06d2570faa0c15"
+SRCREV_perfetto = "7a9a6a0587348bffd1796b66a1da33cc1ea421d8"
 SRCREV_FORMAT = "perfetto"
-PV = "47.0"
-
+PV = "51.2"
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto/0001-Remove-check_build_deps-build-steps.patch b/meta-oe/recipes-devtools/perfetto/perfetto/0001-Remove-check_build_deps-build-steps.patch
index 118c3aed4a..3a046f3d2a 100644
--- a/meta-oe/recipes-devtools/perfetto/perfetto/0001-Remove-check_build_deps-build-steps.patch
+++ b/meta-oe/recipes-devtools/perfetto/perfetto/0001-Remove-check_build_deps-build-steps.patch
@@ -1,4 +1,4 @@
-From 07ddc4b9b7a6fec73cdc295baba353944857212e Mon Sep 17 00:00:00 2001
+From 528887cd2c1ebcda1a788ed2f060ffd1b4887801 Mon Sep 17 00:00:00 2001
 From: Sui Chen <suichen6@gmail.com>
 Date: Mon, 13 Jun 2022 17:46:49 +0000
 Subject: [PATCH] Remove "check_build_deps" build steps
@@ -16,15 +16,15 @@ Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
 Upstream-Status: Pending
 
  gn/BUILD.gn                  |  1 -
- gn/standalone/BUILD.gn       | 12 ++++++------
+ gn/standalone/BUILD.gn       | 20 ++++++++++----------
  gn/standalone/BUILDCONFIG.gn |  5 +++--
- 3 files changed, 9 insertions(+), 9 deletions(-)
+ 3 files changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/gn/BUILD.gn b/gn/BUILD.gn
-index ed055ee700..ea79979ec5 100644
+index 9ce3145cac..67656b6648 100644
 --- a/gn/BUILD.gn
 +++ b/gn/BUILD.gn
-@@ -117,7 +117,6 @@ group("default_deps") {
+@@ -127,7 +127,6 @@ group("default_deps") {
    deps = [ ":gen_buildflags" ]
    if (perfetto_build_standalone) {
      public_deps = [
@@ -33,31 +33,38 @@ index ed055ee700..ea79979ec5 100644
        "//gn/standalone/sanitizers:deps",
      ]
 diff --git a/gn/standalone/BUILD.gn b/gn/standalone/BUILD.gn
-index 36fb6371a5..f7bc97b1a6 100644
+index 2d0a4b2916..740266a964 100644
 --- a/gn/standalone/BUILD.gn
 +++ b/gn/standalone/BUILD.gn
-@@ -469,10 +469,10 @@ config("android_liblog") {
+@@ -514,13 +514,13 @@ config("android_liblog") {
  }
  
  # Checks that tools/install-build-deps has been run since it last changed.
 -perfetto_check_build_deps("check_build_deps") {
--  args = []
+-  args = [ "--no-dev-tools" ]
 -}
-+#perfetto_check_build_deps("check_build_deps") {
-+#  args = []
-+#}
- 
+-
 -perfetto_check_build_deps("check_build_deps_android") {
--  args = [ "--android" ]
+-  args = [
+-    "--no-dev-tools",
+-    "--android",
+-  ]
 -}
++#perfetto_check_build_deps("check_build_deps") {
++#  args = [ "--no-dev-tools" ]
++#}
++#
 +#perfetto_check_build_deps("check_build_deps_android") {
-+#  args = [ "--android" ]
++#  args = [
++#    "--no-dev-tools",
++#    "--android",
++#  ]
 +#}
 diff --git a/gn/standalone/BUILDCONFIG.gn b/gn/standalone/BUILDCONFIG.gn
-index 05ed548f9d..94db724b2b 100644
+index 8e2be2ae1b..0faff46e50 100644
 --- a/gn/standalone/BUILDCONFIG.gn
 +++ b/gn/standalone/BUILDCONFIG.gn
-@@ -59,8 +59,9 @@ declare_args() {
+@@ -62,8 +62,9 @@ declare_args() {
    # the ossfuzz sanitizer overrides this to true. In that config the
    # host/target cpu and arch are identical, but we want to build only the
    # targets with the sanitizer/fuzzer flags
@@ -69,3 +76,6 @@ index 05ed548f9d..94db724b2b 100644
  }
  default_configs = [
    "//gn/standalone:default",
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto/0001-add-missing-includes-for-the-build-with-use_libcxx_m.patch b/meta-oe/recipes-devtools/perfetto/perfetto/0001-add-missing-includes-for-the-build-with-use_libcxx_m.patch
deleted file mode 100644
index 225810e511..0000000000
--- a/meta-oe/recipes-devtools/perfetto/perfetto/0001-add-missing-includes-for-the-build-with-use_libcxx_m.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 3953f56f98420e2ecb0e1c4542e20bfbb81da965 Mon Sep 17 00:00:00 2001
-From: Takuto Ikuta <tikuta@google.com>
-Date: Mon, 9 Dec 2024 18:45:36 +0900
-Subject: [PATCH] add missing includes for the build with use_libcxx_modules
-
-This is to fix build error when we set use_libcxx_modules=true in
-chromium build.
-
-Bug: 40440396
-Change-Id: I0cca5190c2c3551cc62bafafd12da9283e4afdd4
-
-Upstream-Status: Backport [3953f56 add missing includes for the build with use_libcxx_modules]
-- Removed some patches for files that do not exist in the current version v47.0
-
-Signed-off-by: mark.yang <mark.yang@lge.com>
----
-
-diff --git a/include/perfetto/base/flat_set.h b/include/perfetto/base/flat_set.h
-index 9390537b39..5be590ea6b 100644
---- a/include/perfetto/base/flat_set.h
-+++ b/include/perfetto/base/flat_set.h
-@@ -17,7 +17,10 @@
- #ifndef INCLUDE_PERFETTO_BASE_FLAT_SET_H_
- #define INCLUDE_PERFETTO_BASE_FLAT_SET_H_
- 
-+#include <stddef.h>
-+
- #include <algorithm>
-+#include <utility>
- #include <vector>
- 
- // A vector-based set::set-like container.
-diff --git a/include/perfetto/base/time.h b/include/perfetto/base/time.h
-index 6436503d20..8de7648267 100644
---- a/include/perfetto/base/time.h
-+++ b/include/perfetto/base/time.h
-@@ -17,6 +17,7 @@
- #ifndef INCLUDE_PERFETTO_BASE_TIME_H_
- #define INCLUDE_PERFETTO_BASE_TIME_H_
- 
-+#include <stdint.h>
- #include <time.h>
- 
- #include <chrono>
-diff --git a/include/perfetto/ext/base/string_utils.h b/include/perfetto/ext/base/string_utils.h
-index c8264a2fb7..3b15e55771 100644
---- a/include/perfetto/ext/base/string_utils.h
-+++ b/include/perfetto/ext/base/string_utils.h
-@@ -24,6 +24,7 @@
- #include <cinttypes>
- #include <optional>
- #include <string>
-+#include <system_error>
- #include <vector>
- 
- #include "perfetto/ext/base/string_view.h"
-diff --git a/include/perfetto/ext/base/subprocess.h b/include/perfetto/ext/base/subprocess.h
-index 12121e0284..4075169df1 100644
---- a/include/perfetto/ext/base/subprocess.h
-+++ b/include/perfetto/ext/base/subprocess.h
-@@ -20,6 +20,7 @@
- #include <condition_variable>
- #include <functional>
- #include <initializer_list>
-+#include <memory>
- #include <mutex>
- #include <optional>
- #include <string>
-diff --git a/include/perfetto/ext/base/waitable_event.h b/include/perfetto/ext/base/waitable_event.h
-index 0e786196f8..a4b268a2f3 100644
---- a/include/perfetto/ext/base/waitable_event.h
-+++ b/include/perfetto/ext/base/waitable_event.h
-@@ -17,6 +17,8 @@
- #ifndef INCLUDE_PERFETTO_EXT_BASE_WAITABLE_EVENT_H_
- #define INCLUDE_PERFETTO_EXT_BASE_WAITABLE_EVENT_H_
- 
-+#include <stdint.h>
-+
- #include <condition_variable>
- #include <mutex>
- 
-diff --git a/include/perfetto/ext/tracing/core/slice.h b/include/perfetto/ext/tracing/core/slice.h
-index 063043bdc6..cdabc39465 100644
---- a/include/perfetto/ext/tracing/core/slice.h
-+++ b/include/perfetto/ext/tracing/core/slice.h
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_EXT_TRACING_CORE_SLICE_H_
- 
- #include <stddef.h>
-+#include <stdint.h>
- #include <string.h>
- 
- #include <memory>
-diff --git a/src/trace_processor/util/trace_blob_view_reader.h b/src/trace_processor/util/trace_blob_view_reader.h
-index c39ffaba7c..6ffa7ff050 100644
---- a/src/trace_processor/util/trace_blob_view_reader.h
-+++ b/src/trace_processor/util/trace_blob_view_reader.h
-@@ -19,6 +19,7 @@
- 
- #include <cstddef>
- #include <optional>
-+#include <vector>
- 
- #include "perfetto/ext/base/circular_queue.h"
- #include "perfetto/trace_processor/trace_blob_view.h"
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch b/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch
deleted file mode 100644
index 49b7989359..0000000000
--- a/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d005c0123b2f929b918359a53ffe61d7ca2212a0 Mon Sep 17 00:00:00 2001
-From: Lalit Maganti <lalitm@google.com>
-Date: Wed, 14 Aug 2024 11:56:47 +0100
-Subject: [PATCH] traced: fix missing include
-
-Change-Id: Ib9ce8ce5b057e89fa451ccef228228d607b36793
-Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
----
-Upstream-Status: Backport [https://github.com/google/perfetto/commit/d005c0123b2f929b918359a53ffe61d7ca2212a0]
-
- src/traced/probes/sys_stats/sys_stats_data_source.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/traced/probes/sys_stats/sys_stats_data_source.h b/src/traced/probes/sys_stats/sys_stats_data_source.h
-index e09cd8a2ca..7e4749bdcd 100644
---- a/src/traced/probes/sys_stats/sys_stats_data_source.h
-+++ b/src/traced/probes/sys_stats/sys_stats_data_source.h
-@@ -21,6 +21,7 @@
- 
- #include <map>
- #include <memory>
-+#include <optional>
- #include <string>
- 
- #include "perfetto/ext/base/paged_memory.h"
--- 
-2.43.0
-