commit e1324cd4d80c897442902f6358f78b761e42d5ff
author Mark Salyzyn <salyzyn@google.com> Thu May 08 20:33:27 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 08 20:33:27 2014 +0000
tree 0f77cddc28868710e031e2465b26ea45456edf56
parent d4bb3110623b210ac99e036f039a71548a3131d3
parent 17151e4d0e8f01a05c7a117dabcb2f3bdd6d54d2

am 17151e4d: Merge "run-as: turn on -Werror"

* commit '17151e4d0e8f01a05c7a117dabcb2f3bdd6d54d2':
  run-as: turn on -Werror

run-as/Android.mk

diff --git a/run-as/Android.mk b/run-as/Android.mk
index a8f2885..3774acc 100644
--- a/run-as/Android.mk
+++ b/run-as/Android.mk
@@ -1,10 +1,12 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES:= run-as.c package.c
+LOCAL_SRC_FILES := run-as.c package.c
 
 LOCAL_SHARED_LIBRARIES := libselinux
 
-LOCAL_MODULE:= run-as
+LOCAL_MODULE := run-as
+
+LOCAL_CFLAGS := -Werror
 
 include $(BUILD_EXECUTABLE)

run-as/package.c

diff --git a/run-as/package.c b/run-as/package.c
index 901e9e3..57dc00d 100644
--- a/run-as/package.c
+++ b/run-as/package.c
@@ -408,10 +408,6 @@
         value = -1;
     }
     return value;
-
-BAD:
-    *pp = p;
-    return -1;
 }
 
 /* Read the system's package database and extract information about