From 355ff8c7c15310df1159e2a9290c50d24317c600 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Sat, 12 Sep 2020 15:37:39 -0700 Subject: libcutils must check /sys/kernel/tracing for tracefs first Currently it falls back to /sys/kernel/tracing if debugfs is not found. /sys/kernel/tracing must be checked first since debugfs is not allowed to be mounted in user builds starting with Android R launching devices. Test: manual Change-Id: I2fb5ec91bbf7d5304a1a6efcb06530969485e78f --- libcutils/trace-dev.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libcutils/trace-dev.cpp') diff --git a/libcutils/trace-dev.cpp b/libcutils/trace-dev.cpp index 5a09a2d39..1ab63dc2f 100644 --- a/libcutils/trace-dev.cpp +++ b/libcutils/trace-dev.cpp @@ -30,9 +30,9 @@ void atrace_set_tracing_enabled(bool enabled) static void atrace_init_once() { - atrace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_WRONLY | O_CLOEXEC); + atrace_marker_fd = open("/sys/kernel/tracing/trace_marker", O_WRONLY | O_CLOEXEC); if (atrace_marker_fd == -1) { - atrace_marker_fd = open("/sys/kernel/tracing/trace_marker", O_WRONLY | O_CLOEXEC); + atrace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_WRONLY | O_CLOEXEC); } if (atrace_marker_fd == -1) { -- cgit v1.2.3