am 028e38f6: Merge "Create a new location for /data policy files"

* commit '028e38f691c12c3f6f034dd192e5efcae8e767c7':
  Create a new location for /data policy files

init/init.c

@@ -745,6 +745,7 @@ 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, "/data/system/property_contexts" },
         { SELABEL_OPT_PATH, "/property_contexts" },
         { 0, NULL }

rootdir/init.rc

@@ -242,6 +242,9 @@ on post-fs-data
     # the following directory.
     mkdir /data/drm 0770 drm drm
 
+    # Separate location for storing security policy files on data
+    mkdir /data/security 0600 system system
+
     # If there is no fs-post-data action in the init.<device>.rc file, you
     # must uncomment this line, otherwise encrypted filesystems
     # won't work.