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

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

am dd910526: am 6c37d59e: Merge "logd: turn on -Werror" 

* commit 'dd910526':
  logd: turn on -Werror
parents 21852477 dd910526

logd/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    libutils



LOCAL_MODULE_TAGS := optional

LOCAL_CFLAGS := -Werror



include $(BUILD_EXECUTABLE)

logd/CommandListener.cpp

+0 −1
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ int CommandListener::GetStatisticsCmd::runCommand(SocketClient *cli, 
                                         int argc, char **argv) {

    setname();

    uid_t uid = cli->getUid();

    gid_t gid = cli->getGid();

    if (clientHasLogCredentials(cli)) {

        uid = AID_ROOT;

    }

logd/tests/logd_test.cpp

+1 −3
Original line number Diff line number Diff line
@@ -196,8 +196,6 @@ TEST(logd, statistics) { 


    cp = strstr(cp, "Minimum time between log events per dgram_qlen:");



    char *log_events_per_span = cp;



    if (cp) {

        while (*cp && (*cp != '\n')) {

            ++cp;
@@ -462,7 +460,7 @@ TEST(logd, both) { 
            dump_log_msg("user", &msg, 3, -1);

        }



        alarm(0);

        alarm(old_alarm);

        sigaction(SIGALRM, &old_sigaction, NULL);



        close(fd);