Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 607f55de authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge \"logd: Replace logd with chatty log tag\" 

am: 596e65db

Change-Id: I88057f1ffb21e6b0863dd0803a7a9be0ee72cb1c
parents 91272bd4 596e65db

logd/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ LOCAL_SHARED_LIBRARIES := \ 
#  event_flag := $(call event_logtags,auditd)

#  event_flag += $(call event_logtags,logd)

# so make sure we do not regret hard-coding it as follows:

event_flag := -DAUDITD_LOG_TAG=1003 -DLOGD_LOG_TAG=1004

event_flag := -DAUDITD_LOG_TAG=1003 -DCHATTY_LOG_TAG=1004



LOCAL_CFLAGS := -Werror $(event_flag)

logd/LogBufferElement.cpp

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ size_t LogBufferElement::populateDroppedMessage(char *&buffer, 
        android_log_event_string_t *event =

            reinterpret_cast<android_log_event_string_t *>(buffer);



        event->header.tag = htole32(LOGD_LOG_TAG);

        event->header.tag = htole32(CHATTY_LOG_TAG);

        event->type = EVENT_TYPE_STRING;

        event->length = htole32(len);

    } else {

logd/event.logtags

+1 −1
Original line number Diff line number Diff line
@@ -34,4 +34,4 @@ 
# TODO: generate ".java" and ".h" files with integer constants from this file.



1003  auditd (avc|3)

1004  logd (dropped|3)
 
1004  chatty (dropped|3)