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

Commit fb59398d authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android Git Automerger
Browse files

am 63a14ed7: am ae3ba0b3: am 472e04f2: Merge "logd: liblog: logcat: enable prune features for user" 

* commit '63a14ed7':
  logd: liblog: logcat: enable prune features for user
parents 11673a03 63a14ed7

include/log/logger.h

+0 −4
Original line number Diff line number Diff line
@@ -142,9 +142,7 @@ log_id_t android_logger_get_id(struct logger *logger); 


int android_logger_clear(struct logger *logger);

long android_logger_get_log_size(struct logger *logger);

#ifdef USERDEBUG_BUILD

int android_logger_set_log_size(struct logger *logger, unsigned long size);

#endif

long android_logger_get_log_readable_size(struct logger *logger);

int android_logger_get_log_version(struct logger *logger);
@@ -152,12 +150,10 @@ struct logger_list; 


ssize_t android_logger_get_statistics(struct logger_list *logger_list,

                                      char *buf, size_t len);

#ifdef USERDEBUG_BUILD

ssize_t android_logger_get_prune_list(struct logger_list *logger_list,

                                      char *buf, size_t len);

int android_logger_set_prune_list(struct logger_list *logger_list,

                                  char *buf, size_t len);

#endif



struct logger_list *android_logger_list_alloc(int mode,

                                              unsigned int tail,

liblog/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -22,10 +22,6 @@ else 
liblog_sources := logd_write_kern.c

endif



ifneq ($(filter userdebug eng,$(TARGET_BUILD_VARIANT)),)

liblog_cflags := -DUSERDEBUG_BUILD=1

endif



# some files must not be compiled when building against Mingw

# they correspond to features not used by our host development tools

# which are also hard or even impossible to port to native Win32

liblog/log_read.c

+0 −8
Original line number Diff line number Diff line
@@ -340,8 +340,6 @@ long android_logger_get_log_size(struct logger *logger) 
    return atol(buf);

}



#ifdef USERDEBUG_BUILD



int android_logger_set_log_size(struct logger *logger, unsigned long size)

{

    char buf[512];
@@ -352,8 +350,6 @@ int android_logger_set_log_size(struct logger *logger, unsigned long size) 
    return check_log_success(buf, send_log_msg(NULL, NULL, buf, sizeof(buf)));

}



#endif /* USERDEBUG_BUILD */



/*

 * returns the readable size of the log's ring buffer (that is, amount of the

 * log consumed)
@@ -408,8 +404,6 @@ ssize_t android_logger_get_statistics(struct logger_list *logger_list, 
    return send_log_msg(NULL, NULL, buf, len);

}



#ifdef USERDEBUG_BUILD



ssize_t android_logger_get_prune_list(struct logger_list *logger_list UNUSED,

                                      char *buf, size_t len)

{
@@ -432,8 +426,6 @@ int android_logger_set_prune_list(struct logger_list *logger_list UNUSED, 
    return check_log_success(buf, send_log_msg(NULL, NULL, buf, len));

}



#endif /* USERDEBUG_BUILD */



struct logger_list *android_logger_list_alloc(int mode,

                                              unsigned int tail,

                                              pid_t pid)

liblog/log_read_kern.c

+0 −8
Original line number Diff line number Diff line
@@ -232,16 +232,12 @@ long android_logger_get_log_size(struct logger *logger) 
    return logger_ioctl(logger, LOGGER_GET_LOG_BUF_SIZE, O_RDWR);

}



#ifdef USERDEBUG_BUILD



int android_logger_set_log_size(struct logger *logger UNUSED,

                                unsigned long size UNUSED)

{

    return -ENOTSUP;

}



#endif /* USERDEBUG_BUILD */



/*

 * returns the readable size of the log's ring buffer (that is, amount of the

 * log consumed)
@@ -272,8 +268,6 @@ ssize_t android_logger_get_statistics(struct logger_list *logger_list UNUSED, 
    return -ENOTSUP;

}



#ifdef USERDEBUG_BUILD



ssize_t android_logger_get_prune_list(struct logger_list *logger_list UNUSED,

                                      char *buf, size_t len)

{
@@ -289,8 +283,6 @@ int android_logger_set_prune_list(struct logger_list *logger_list UNUSED, 
    return -ENOTSUP;

}



#endif /* USERDEBUG_BUILD */



struct logger_list *android_logger_list_alloc(int mode,

                                              unsigned int tail,

                                              pid_t pid)

logcat/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



ifneq ($(filter userdebug eng,$(TARGET_BUILD_VARIANT)),)

LOCAL_CFLAGS += -DUSERDEBUG_BUILD=1

endif



LOCAL_SRC_FILES:= logcat.cpp event.logtags



LOCAL_SHARED_LIBRARIES := liblog