am dd910526: am 6c37d59e: Merge "logd: turn on -Werror"
* commit 'dd91052639b8c38d9fd6f3632fa4cc4243bdeeeb': logd: turn on -Werror
This commit is contained in:
commit
befbfb94be
|
@ -25,7 +25,7 @@ LOCAL_SHARED_LIBRARIES := \
|
|||
libcutils \
|
||||
libutils
|
||||
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_CFLAGS := -Werror
|
||||
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue