diff --git a/.pick_status.json b/.pick_status.json
index fed0b0ec659..b7e5a46773b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5354,7 +5354,7 @@
         "description": "util/perf: amend missing atrace_init",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/util/perf/cpu_trace.h b/src/util/perf/cpu_trace.h
index 8ce3e8d0aa7..5c7133e5d56 100644
--- a/src/util/perf/cpu_trace.h
+++ b/src/util/perf/cpu_trace.h
@@ -204,7 +204,12 @@ _mesa_trace_scope_end(UNUSED void **scope)
 static inline void
 util_cpu_trace_init()
 {
+#if defined(HAVE_PERFETTO)
    util_perfetto_init();
+#elif DETECT_OS_ANDROID && !defined(__cplusplus)
+   atrace_init();
+#endif /* HAVE_PERFETTO */
+
    util_gpuvis_init();
 }