From 723dfbec389f6aec7c858ddb8e7283d84df00492 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Wed, 13 Apr 2022 18:43:42 +0900 Subject: [PATCH] universal7885: debug_daemon: Rename to EKLogger Signed-off-by: roynatech2544 --- .../{debug => eklogger}/Android.bp | 4 ++-- .../{debug => eklogger}/Logger.cpp | 0 .../eklogger.rc} | 6 +++--- .../sepolicy/private/debug_daemon.te | 17 ----------------- .../sepolicy/private/eklogger.te | 17 +++++++++++++++++ .../sepolicy/private/file_contexts | 6 +++--- universal7885-common/universal7885-common.mk | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) rename universal7885-common/{debug => eklogger}/Android.bp (91%) rename universal7885-common/{debug => eklogger}/Logger.cpp (100%) rename universal7885-common/{debug/init.debug_daemon.rc => eklogger/eklogger.rc} (69%) delete mode 100644 universal7885-common/sepolicy/private/debug_daemon.te create mode 100644 universal7885-common/sepolicy/private/eklogger.te diff --git a/universal7885-common/debug/Android.bp b/universal7885-common/eklogger/Android.bp similarity index 91% rename from universal7885-common/debug/Android.bp rename to universal7885-common/eklogger/Android.bp index 56fe276..185c024 100644 --- a/universal7885-common/debug/Android.bp +++ b/universal7885-common/eklogger/Android.bp @@ -15,9 +15,9 @@ // cc_binary { - name: "debug_daemon", + name: "eklogger", srcs: [ "Logger.cpp", ], - init_rc: ["init.debug_daemon.rc"], + init_rc: ["eklogger.rc"], } diff --git a/universal7885-common/debug/Logger.cpp b/universal7885-common/eklogger/Logger.cpp similarity index 100% rename from universal7885-common/debug/Logger.cpp rename to universal7885-common/eklogger/Logger.cpp diff --git a/universal7885-common/debug/init.debug_daemon.rc b/universal7885-common/eklogger/eklogger.rc similarity index 69% rename from universal7885-common/debug/init.debug_daemon.rc rename to universal7885-common/eklogger/eklogger.rc index bccb1d1..73da727 100644 --- a/universal7885-common/debug/init.debug_daemon.rc +++ b/universal7885-common/eklogger/eklogger.rc @@ -1,4 +1,4 @@ -service debug_daemon /system/bin/debug_daemon +service eureka_debugger /system/bin/eklogger user root group system oneshot @@ -8,7 +8,7 @@ on post-fs-data mkdir /data/debug 0755 root system encryption=None rm /data/debug/logcat.txt rm /data/debug/kmsg.txt - start debug_daemon + start eureka_debugger on property:sys.boot_completed=1 - stop debug_daemon + stop eureka_debugger diff --git a/universal7885-common/sepolicy/private/debug_daemon.te b/universal7885-common/sepolicy/private/debug_daemon.te deleted file mode 100644 index f3732ef..0000000 --- a/universal7885-common/sepolicy/private/debug_daemon.te +++ /dev/null @@ -1,17 +0,0 @@ -type debug_daemon, domain, coredomain; -type debug_daemon_exec, exec_type, file_type, system_file_type; -init_daemon_domain(debug_daemon) -type debug_daemon_data_file, file_type, data_file_type, core_data_file_type; - -allow debug_daemon debug_daemon_data_file:dir rw_dir_perms; -allow debug_daemon debug_daemon_data_file:file rw_file_perms; -allow debug_daemon proc_kmsg:file r_file_perms; -allow debug_daemon logcat_exec:file rx_file_perms; -allow debug_daemon self:capability2 syslog; -allow debug_daemon kernel:system syslog_mod; -allow debug_daemon debug_daemon_data_file:file create_file_perms; -allow debug_daemon shell_exec:file rx_file_perms; -allow debug_daemon self:capability sys_nice; -allow debug_daemon logdr_socket:sock_file write; -allow debug_daemon logd:unix_stream_socket connectto; - diff --git a/universal7885-common/sepolicy/private/eklogger.te b/universal7885-common/sepolicy/private/eklogger.te new file mode 100644 index 0000000..6ad0342 --- /dev/null +++ b/universal7885-common/sepolicy/private/eklogger.te @@ -0,0 +1,17 @@ +type eklogger, domain, coredomain; +type eklogger_exec, exec_type, file_type, system_file_type; +init_daemon_domain(eklogger) +type eklogger_data_file, file_type, data_file_type, core_data_file_type; + +allow eklogger eklogger_data_file:dir rw_dir_perms; +allow eklogger eklogger_data_file:file rw_file_perms; +allow eklogger proc_kmsg:file r_file_perms; +allow eklogger logcat_exec:file rx_file_perms; +allow eklogger self:capability2 syslog; +allow eklogger kernel:system syslog_mod; +allow eklogger eklogger_data_file:file create_file_perms; +allow eklogger shell_exec:file rx_file_perms; +allow eklogger self:capability sys_nice; +allow eklogger logdr_socket:sock_file write; +allow eklogger logd:unix_stream_socket connectto; + diff --git a/universal7885-common/sepolicy/private/file_contexts b/universal7885-common/sepolicy/private/file_contexts index 1082552..13c8268 100644 --- a/universal7885-common/sepolicy/private/file_contexts +++ b/universal7885-common/sepolicy/private/file_contexts @@ -3,6 +3,6 @@ ### DATA /data/zram(/.*)? u:object_r:zram_data_file:s0 -# DEBUG DAEMON -/system/bin/debug_daemon u:object_r:debug_daemon_exec:s0 -/data/debug(/.*)? u:object_r:debug_daemon_data_file:s0 +# Eureka Bootlogger +/system/bin/eklogger u:object_r:eklogger_exec:s0 +/data/debug(/.*)? u:object_r:eklogger_data_file:s0 diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk index c64e293..d45a4cf 100644 --- a/universal7885-common/universal7885-common.mk +++ b/universal7885-common/universal7885-common.mk @@ -72,7 +72,7 @@ PRODUCT_PACKAGES += \ libsuspend # Debug -PRODUCT_PACKAGES += debug_daemon +PRODUCT_PACKAGES += eklogger # DRM PRODUCT_PACKAGES += \