commit 3b2e4db8676d6afd2fb9a09f02c37159163b5bc1
author Mark Salyzyn <salyzyn@google.com> Wed Apr 01 19:27:08 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 01 19:27:09 2015 +0000
tree 5a87313c11ed1dc018f5ed6464ae4060a3a03317
parent f114ab82ed181847fd177b4c2bdfccb780915c41
parent 56116e7b894f5b5531ccc48282ea92a2269eed83

Merge "logd: missing include for string.h"

init/init_parser.cpp

diff --git a/init/init_parser.cpp b/init/init_parser.cpp
index 4e18e20..593f0c5 100644
--- a/init/init_parser.cpp
+++ b/init/init_parser.cpp
@@ -122,7 +122,6 @@
         break;
     case 'c':
         if (!strcmp(s, "opy")) return K_copy;
-        if (!strcmp(s, "apability")) return K_capability;
         if (!strcmp(s, "lass")) return K_class;
         if (!strcmp(s, "lass_start")) return K_class_start;
         if (!strcmp(s, "lass_stop")) return K_class_stop;
@@ -776,8 +775,6 @@
 
     kw = lookup_keyword(args[0]);
     switch (kw) {
-    case K_capability:
-        break;
     case K_class:
         if (nargs != 2) {
             parse_error(state, "class option requires a classname\n");

init/keywords.h

diff --git a/init/keywords.h b/init/keywords.h
index 34cb2ad..4bd0ba6 100644
--- a/init/keywords.h
+++ b/init/keywords.h
@@ -45,7 +45,6 @@
 enum {
     K_UNKNOWN,
 #endif
-    KEYWORD(capability,  OPTION,  0, 0)
     KEYWORD(class,       OPTION,  0, 0)
     KEYWORD(class_start, COMMAND, 1, do_class_start)
     KEYWORD(class_stop,  COMMAND, 1, do_class_stop)

run-as/package.c

diff --git a/run-as/package.c b/run-as/package.c
index 4f8f3a7..9e1f5bb 100644
--- a/run-as/package.c
+++ b/run-as/package.c
@@ -16,9 +16,11 @@
 */
 #include <errno.h>
 #include <fcntl.h>
-#include <unistd.h>
-#include <sys/stat.h>
+#include <string.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include <private/android_filesystem_config.h>
 #include "package.h"