summaryrefslogtreecommitdiffstats
path: root/init/init_parser.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-24 19:41:19 +0000
committerElliott Hughes <enh@google.com>2015-04-24 12:41:47 -0700
commitc7ca9dd6c87d69c73706ddc5d739dd9d71314b62 (patch)
treec863388c458cf8d06882cb4c22616109bf6bafb4 /init/init_parser.cpp
parent132440b087d35ebddd021b86bdcb3aa5c8feec80 (diff)
downloadsystem_core-c7ca9dd6c87d69c73706ddc5d739dd9d71314b62.zip
system_core-c7ca9dd6c87d69c73706ddc5d739dd9d71314b62.tar.gz
system_core-c7ca9dd6c87d69c73706ddc5d739dd9d71314b62.tar.bz2
Revert "Revert "Remove now-unusable 'setcon' command.""
This reverts commit b862bd00a4192d48c3ae82156d8c35b32283e9e4. This change was fine but an earlier change it depended on was broken. That change has been fixed and resubmitted. Bug: http://b/19702273 Change-Id: I17e565721026e48e2a73526f729f2481d4d6edb5
Diffstat (limited to 'init/init_parser.cpp')
-rw-r--r--init/init_parser.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/init/init_parser.cpp b/init/init_parser.cpp
index ff31093..b76b04e 100644
--- a/init/init_parser.cpp
+++ b/init/init_parser.cpp
@@ -184,7 +184,6 @@ static int lookup_keyword(const char *s)
case 's':
if (!strcmp(s, "eclabel")) return K_seclabel;
if (!strcmp(s, "ervice")) return K_service;
- if (!strcmp(s, "etcon")) return K_setcon;
if (!strcmp(s, "etenv")) return K_setenv;
if (!strcmp(s, "etprop")) return K_setprop;
if (!strcmp(s, "etrlimit")) return K_setrlimit;