Merge "ueventd: easier debug logging" (9f4d558e) · Commits · e / os / android_system_core

init/Android.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,9 @@ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
		LOCAL_CFLAGS += -DALLOW_LOCAL_PROP_OVERRIDE=1
		endif

		# Enable ueventd logging
		#LOCAL_CFLAGS += -DLOG_UEVENTS=1

		LOCAL_MODULE:= init

		LOCAL_FORCE_STATIC_EXECUTABLE := true
		@@ -42,6 +45,8 @@ LOCAL_STATIC_LIBRARIES := \
		libmincrypt \
		libext4_utils_static

		LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk

		include $(BUILD_EXECUTABLE)

		# Make a symlink from /sbin/ueventd and /sbin/watchdogd to /init

+0 −2

Original line number	Diff line number	Diff line
		@@ -23,6 +23,4 @@
		#define NOTICE(x...) KLOG_NOTICE("init", x)
		#define INFO(x...) KLOG_INFO("init", x)

		#define LOG_UEVENTS 0 /* log uevent messages if 1. verbose */

		#endif

+6 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,12 @@ int ueventd_main(int argc, char **argv)

		open_devnull_stdio();
		klog_init();
		#if LOG_UEVENTS
		/* Ensure we're at a logging level that will show the events */
		if (klog_get_level() < KLOG_LEVEL_INFO) {
		klog_set_level(KLOG_LEVEL_INFO);
		}
		#endif

		INFO("starting ueventd\n");