logd: make logd run and relink logcat
Change-Id: I5a2984ea2649bebd923d42e6b984856b36b18fbd
diff --git a/etc/init.rc b/etc/init.rc
index f934cbd..d0baeb8 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -99,6 +99,8 @@
trigger early-boot
trigger boot
+ start logd
+
on property:sys.powerctl=*
powerctl ${sys.powerctl}
diff --git a/etc/init.recovery.logd.rc b/etc/init.recovery.logd.rc
index 423039c..364fd82 100644
--- a/etc/init.recovery.logd.rc
+++ b/etc/init.recovery.logd.rc
@@ -1,13 +1,10 @@
-on load_all_props_action
- start logd
-
-on load_persist_props_action
- start logd
-
service logd /sbin/logd
class core
- socket logd stream 0666 logd logd
- socket logdr seqpacket 0666 logd logd
- socket logdw dgram 0222 logd logd
- group root system
+ socket logdr seqpacket 0666 root root
+ socket logdw dgram+passcred 0222 root root
+ file /proc/kmsg r
+ file /dev/kmsg w
+ user root
+ group root
+ capabilities SYSLOG AUDIT_CONTROL SETGID SETUID
seclabel u:r:logd:s0
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index cfcdae1..fca8f42 100755
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -88,7 +88,6 @@
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/libc.so
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/libdl.so
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/libm.so
- RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/libbacktrace.so
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/libbootloader_message.so
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/libfs_mgr.so
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/libfscrypt.so
@@ -102,9 +101,11 @@
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/libadbd_services.so
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/libcap.so
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/libminijail.so
- RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/bin/toybox
- # RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/libinit.so
+ RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/libunwindstack.so
+ RELINK_SOURCE_FILES += $(TARGET_ROOT_OUT)/../system/lib64/libinit.so
RELINK_SOURCE_FILES += $(TARGET_ROOT_OUT)/../system/lib64/libdl_android.so
+ RELINK_SOURCE_FILES += $(TARGET_ROOT_OUT)/../system/lib64/libprotobuf-cpp-lite.so
+ RELINK_SOURCE_FILES += $(TARGET_ROOT_OUT)/../system/lib64/libbinder.so
else
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libc.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libdl.so
@@ -177,7 +178,11 @@
else
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 23; echo $$?),0)
# Android M libraries
- RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbacktrace.so
+ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 29; echo $$?),0)
+ RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/lib64/libbacktrace.so
+ else
+ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbacktrace.so
+ endif
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libunwind.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbase.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libc++.so
@@ -395,9 +400,17 @@
endif
endif
ifeq ($(TWRP_INCLUDE_LOGCAT), true)
- RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/logcat
+ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 29; echo $$?),0)
+ RELINK_SOURCE_FILES += $(TARGET_ROOT_OUT)/../system/bin/logcat
+ else
+ RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/logcat
+ endif
ifeq ($(TARGET_USES_LOGD), true)
- RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/logd
+ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 29; echo $$?),0)
+ RELINK_SOURCE_FILES += $(TARGET_ROOT_OUT)/../system/bin/logd
+ else
+ RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/logd
+ endif
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libsysutils.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libnl.so
endif