commit 3ccf567ab81e12dfe7167200e08fbcfe0186a709
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 01 07:00:29 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 01 07:00:29 2020 +0000
tree bc51ebef103aec683a48dc5974254938a3c8ad9d
parent 37e3ca0c42213a040352566ba463f6f22c690d05
parent 2e096b22bcd29fe251e6ef741d81da654a8cafb3

Merge "Check /sys/kernel/tracing for tracefs" am: a6c834f960

Change-Id: Ied26985b145eea03815c384bd225594dda7710e9

libcutils/trace-dev.cpp

diff --git a/libcutils/trace-dev.cpp b/libcutils/trace-dev.cpp
index 2ee39d3..9ca1729 100644
--- a/libcutils/trace-dev.cpp
+++ b/libcutils/trace-dev.cpp
@@ -32,6 +32,10 @@
 {
     atrace_marker_fd = open("/sys/kernel/debug/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);
+    }
+
+    if (atrace_marker_fd == -1) {
         ALOGE("Error opening trace file: %s (%d)", strerror(errno), errno);
         atrace_enabled_tags = 0;
     } else {