commit 559eba43833f81d767eb70d1a7670cbf20b273ef
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jun 18 10:15:59 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jun 18 10:15:59 2022 +0000
tree 386d078abc264bf3e1e73c2dc1aed1405d0bd7dd
parent 2844f211890c240140d420e4f6916dc7a81375d6
parent 5abd9c07a5b8c95b7f1bf72b81989563f53873ca

Merge "Revert "Add group ID for reading tracefs"" into android12-gsi

libcutils/include/private/android_filesystem_config.h

diff --git a/libcutils/include/private/android_filesystem_config.h b/libcutils/include/private/android_filesystem_config.h
index ffd4d12..8f22d89 100644
--- a/libcutils/include/private/android_filesystem_config.h
+++ b/libcutils/include/private/android_filesystem_config.h
@@ -157,7 +157,6 @@
 #define AID_READPROC 3009     /* Allow /proc read access */
 #define AID_WAKELOCK 3010     /* Allow system wakelock read/write access */
 #define AID_UHID 3011         /* Allow read/write to /dev/uhid node */
-#define AID_READTRACEFS 3012  /* Allow tracefs read */
 
 /* The range 5000-5999 is also reserved for vendor partition. */
 #define AID_OEM_RESERVED_2_START 5000

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index da7af17..b8fbd14 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -78,8 +78,8 @@
     mkdir /dev/boringssl 0755 root root
     mkdir /dev/boringssl/selftest 0755 root root
 
-    # Mount tracefs (with GID=AID_READTRACEFS)
-    mount tracefs tracefs /sys/kernel/tracing gid=3012
+    # Mount tracefs
+    mount tracefs tracefs /sys/kernel/tracing
 
     # create sys dirctory
     mkdir /dev/sys 0755 system system