Amalgamated source for v43.1

Change-Id: I9d386ce4312af1fafa2a11106a96243bd373eb3b
google · Mar 5, 2024 · 7e89582 · 7e89582
1 parent cb45432
commit 7e89582
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -9,6 +9,12 @@ Unreleased:
     *
 
 
+v43.1 - 2024-03-05:
+  Tracing service and probes:
+    * Cherry-pick of https://r.android.com/2988674, which fixes the android x86
+      standalone build.
+
+
 v43.0 - 2024-03-05:
   Tracing service and probes:
     * Buffers marked as `transfer_on_clone` will be flushed independently when

diff --git a/sdk/perfetto.cc b/sdk/perfetto.cc
@@ -40443,8 +40443,8 @@ const char* GetVersionCode();
 #ifndef GEN_PERFETTO_VERSION_GEN_H_
 #define GEN_PERFETTO_VERSION_GEN_H_
 
-#define PERFETTO_VERSION_STRING() "v43.0-173d60b91"
-#define PERFETTO_VERSION_SCM_REVISION() "173d60b918b454f7b0fa2174885e787adbf8a3fb"
+#define PERFETTO_VERSION_STRING() "v43.1-cb4543283"
+#define PERFETTO_VERSION_SCM_REVISION() "cb45432836de18cf471653f2d1a13499760e69c6"
 
 #endif  // GEN_PERFETTO_VERSION_GEN_H_
 /*