commit de180fc2834a3e42b6383027cf47b561e861108e
author Chih-Hung Hsieh <chh@google.com> Wed Dec 10 22:19:19 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 10 22:19:19 2014 +0000
tree 936da84af33a0a3872cc59a5a0aeb2e82b14fdef
parent 250d1d1bf3cd462065a456369c11a3ce8fbe531f
parent 058932c4ff89b7d42734cba0a7aa7805c2859a11

Merge "Remove unused local variable."

init/init.c

diff --git a/init/init.c b/init/init.c
index 2b82937..7ddab80 100644
--- a/init/init.c
+++ b/init/init.c
@@ -858,26 +858,6 @@
 }
 #endif
 
-static const struct selinux_opt seopts_prop[] = {
-        { SELABEL_OPT_PATH, "/property_contexts" },
-        { SELABEL_OPT_PATH, "/data/security/current/property_contexts" },
-        { 0, NULL }
-};
-
-struct selabel_handle* selinux_android_prop_context_handle(void)
-{
-    int policy_index = selinux_android_use_data_policy() ? 1 : 0;
-    struct selabel_handle* sehandle = selabel_open(SELABEL_CTX_ANDROID_PROP,
-                                                   &seopts_prop[policy_index], 1);
-    if (!sehandle) {
-        ERROR("SELinux:  Could not load property_contexts:  %s\n",
-              strerror(errno));
-        return NULL;
-    }
-    INFO("SELinux: Loaded property contexts from %s\n", seopts_prop[policy_index].value);
-    return sehandle;
-}
-
 void selinux_init_all_handles(void)
 {
     sehandle = selinux_android_file_context_handle();