From 8c943b6dc8268c25efddedce99b8d42306a323bd Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Mon, 21 Sep 2015 10:51:15 -0700 Subject: [PATCH] logpersist: bundle with logcatd service Bug: 23186545 Change-Id: I130d7c7e120acb372e58aec028f39e161d53628e --- logcat/Android.mk | 11 +++++++++++ {logd => logcat}/logpersist | 0 logd/Android.mk | 11 ----------- 3 files changed, 11 insertions(+), 11 deletions(-) rename {logd => logcat}/logpersist (100%) diff --git a/logcat/Android.mk b/logcat/Android.mk index 844ab8bff..c4a9550d9 100644 --- a/logcat/Android.mk +++ b/logcat/Android.mk @@ -15,4 +15,15 @@ LOCAL_INIT_RC := logcatd.rc include $(BUILD_EXECUTABLE) +include $(CLEAR_VARS) + +LOCAL_MODULE := logpersist.start +LOCAL_MODULE_TAGS := debug +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_PATH := $(bin_dir) +LOCAL_SRC_FILES := logpersist +ALL_TOOLS := logpersist.start logpersist.stop logpersist.cat +LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(filter-out $(LOCAL_MODULE),$(ALL_TOOLS)),ln -sf $(LOCAL_MODULE) $(TARGET_OUT)/bin/$(t);) +include $(BUILD_PREBUILT) + include $(call first-makefiles-under,$(LOCAL_PATH)) diff --git a/logd/logpersist b/logcat/logpersist similarity index 100% rename from logd/logpersist rename to logcat/logpersist diff --git a/logd/Android.mk b/logd/Android.mk index 01c51c7a9..c00061b21 100644 --- a/logd/Android.mk +++ b/logd/Android.mk @@ -43,15 +43,4 @@ LOCAL_CFLAGS := -Werror $(event_flag) include $(BUILD_EXECUTABLE) -include $(CLEAR_VARS) - -LOCAL_MODULE := logpersist.start -LOCAL_MODULE_TAGS := debug -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_PATH := $(bin_dir) -LOCAL_SRC_FILES := logpersist -ALL_TOOLS := logpersist.start logpersist.stop logpersist.cat -LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(filter-out $(LOCAL_MODULE),$(ALL_TOOLS)),ln -sf $(LOCAL_MODULE) $(TARGET_OUT)/bin/$(t);) -include $(BUILD_PREBUILT) - include $(call first-makefiles-under,$(LOCAL_PATH))