commit dd91052639b8c38d9fd6f3632fa4cc4243bdeeeb
author Mark Salyzyn <salyzyn@google.com> Fri May 02 22:00:12 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 02 22:00:12 2014 +0000
tree a4b125211b482236f30fabbe0137100c59c093df
parent 15704b1bdfc7ddf080d50f7a5cf478dfb6608962
parent 6c37d59eac5684990612258808a8d6d487e53c07

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

* commit '6c37d59eac5684990612258808a8d6d487e53c07':
  logd: turn on -Werror

logd/Android.mk

diff --git a/logd/Android.mk b/logd/Android.mk
index 0235478..9f4c64f 100644
--- a/logd/Android.mk
+++ b/logd/Android.mk
@@ -25,7 +25,7 @@
     libcutils \
     libutils
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS := -Werror
 
 include $(BUILD_EXECUTABLE)
 

logd/CommandListener.cpp

diff --git a/logd/CommandListener.cpp b/logd/CommandListener.cpp
index 1f3fd0e..9d7d152 100644
--- a/logd/CommandListener.cpp
+++ b/logd/CommandListener.cpp
@@ -208,7 +208,6 @@
                                          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

diff --git a/logd/tests/logd_test.cpp b/logd/tests/logd_test.cpp
index 731aff6..5b51b1f 100644
--- a/logd/tests/logd_test.cpp
+++ b/logd/tests/logd_test.cpp
@@ -196,8 +196,6 @@
 
     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 @@
             dump_log_msg("user", &msg, 3, -1);
         }
 
-        alarm(0);
+        alarm(old_alarm);
         sigaction(SIGALRM, &old_sigaction, NULL);
 
         close(fd);