summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorGeremy Condra <gcondra@google.com>2013-03-27 16:42:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-27 16:42:21 -0700
commitde97f798a1c24303de35ff44e2f47b590b46a815 (patch)
treec1e81800455b1ad5a829fed60f730582b93580f4 /init
parentd118394d444107dba4430723d248863ff412c444 (diff)
parentbed08333d921e97bc60b81c0f183816386709d79 (diff)
downloadsystem_core-de97f798a1c24303de35ff44e2f47b590b46a815.zip
system_core-de97f798a1c24303de35ff44e2f47b590b46a815.tar.gz
system_core-de97f798a1c24303de35ff44e2f47b590b46a815.tar.bz2
am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"
* commit 'bed08333d921e97bc60b81c0f183816386709d79': Drop /data/system as a policy file location
Diffstat (limited to 'init')
-rwxr-xr-xinit/init.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/init/init.c b/init/init.c
index ede2daa..b28b0ab 100755
--- a/init/init.c
+++ b/init/init.c
@@ -746,7 +746,6 @@ static int bootchart_init_action(int nargs, char **args)
static const struct selinux_opt seopts_prop[] = {
{ SELABEL_OPT_PATH, "/data/security/property_contexts" },
- { SELABEL_OPT_PATH, "/data/system/property_contexts" },
{ SELABEL_OPT_PATH, "/property_contexts" },
{ 0, NULL }
};