summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-01-19 18:29:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-01-19 18:29:01 +0000
commit349f894e522830f462fdfff64d2ef8bec5dcf747 (patch)
tree433d7b0f7cb265722d76fdf4cbbb37e53a1b2251 /init
parent10c51a38752d8f57f144f114331956c995180ad9 (diff)
parentdc3a42bb11dc2aefee37f799b5a1cce87cf35aaf (diff)
downloadsystem_core-349f894e522830f462fdfff64d2ef8bec5dcf747.zip
system_core-349f894e522830f462fdfff64d2ef8bec5dcf747.tar.gz
system_core-349f894e522830f462fdfff64d2ef8bec5dcf747.tar.bz2
Merge "don't load property_contexts from /data"
Diffstat (limited to 'init')
-rw-r--r--init/init.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/init/init.c b/init/init.c
index 4266a73..08fd5fb 100644
--- a/init/init.c
+++ b/init/init.c
@@ -842,7 +842,6 @@ static int bootchart_init_action(int nargs, char **args)
#endif
static const struct selinux_opt seopts_prop[] = {
- { SELABEL_OPT_PATH, "/data/security/property_contexts" },
{ SELABEL_OPT_PATH, "/property_contexts" },
{ 0, NULL }
};