summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-30 09:21:54 -0700
committerMark Salyzyn <salyzyn@google.com>2014-05-02 14:16:00 -0700
commitc61895ac3a9717dac6b24ce210aab0ccae6747f4 (patch)
tree4c9f77c10ff5ade85ca20089ed1ecf7ecaba6e15
parent3cb54987857690fa5b73f0192cc052eb55b562f7 (diff)
downloadsystem_core-c61895ac3a9717dac6b24ce210aab0ccae6747f4.zip
system_core-c61895ac3a9717dac6b24ce210aab0ccae6747f4.tar.gz
system_core-c61895ac3a9717dac6b24ce210aab0ccae6747f4.tar.bz2
logd: turn on -Werror
- Deal with some -Wunused / -Wunused-variable issues Change-Id: Ic86cd7b0680868ad0536198b71a34cb19134fc21
-rw-r--r--logd/Android.mk2
-rw-r--r--logd/CommandListener.cpp1
-rw-r--r--logd/tests/logd_test.cpp4
3 files changed, 2 insertions, 5 deletions
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 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils
-LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS := -Werror
include $(BUILD_EXECUTABLE)
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 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;
}
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 @@ 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);