commit 72a9a362358a5dc9716b8e002b16cf66fd450629
author Chih-hung Hsieh <chh@google.com> Tue Dec 05 23:16:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 05 23:16:55 2017 +0000
tree 31c6ba9638588776e5b7ae064e58baf9984e27de
parent e725faa186ff916ff7b3fb7d04f7026773498580
parent 68686bd15198f64db633a757718b918895a1ca71

Merge "Use -Werror in frameworks/native/cmds/cmd"
am: 68686bd151

Change-Id: I690f234edece16c44c359c9aefbe1dc2c7494846

cmds/cmd/Android.mk

diff --git a/cmds/cmd/Android.mk b/cmds/cmd/Android.mk
index d565e57..4868555 100644
--- a/cmds/cmd/Android.mk
+++ b/cmds/cmd/Android.mk
@@ -10,6 +10,8 @@
     libselinux \
 	libbinder
 
+LOCAL_CFLAGS := -Wall -Werror
+
 LOCAL_C_INCLUDES += \
     $(JNI_H_INCLUDE)
 

cmds/cmd/cmd.cpp

diff --git a/cmds/cmd/cmd.cpp b/cmds/cmd/cmd.cpp
index 014c995..022d3dd 100644
--- a/cmds/cmd/cmd.cpp
+++ b/cmds/cmd/cmd.cpp
@@ -78,7 +78,7 @@
         if (is_selinux_enabled() && seLinuxContext.size() > 0) {
             String8 seLinuxContext8(seLinuxContext);
             security_context_t tmp = NULL;
-            int ret = getfilecon(fullPath.string(), &tmp);
+            getfilecon(fullPath.string(), &tmp);
             Unique_SecurityContext context(tmp);
             int accessGranted = selinux_check_access(seLinuxContext8.string(), context.get(),
                     "file", "write", NULL);