commit 2845a2c7b5e014d1f93437c08dd237afce71bcb8
author Sandeep Patil <sspatil@google.com> Mon Jan 30 19:21:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 30 19:21:52 2017 +0000
tree 61eb70f4c38f1be2b6c59fe0076ca66e3c8920a7
parent b3878a21798e376a5e8f3cfb5eeacaaafb22271a
parent b785ef698264922337eb0aa047bc21431c4b84c0

init: split property context into platform & non-platform components
am: 7a5db4ec7f

Change-Id: Ic0e4926d9142b56256cce3ba7e27d4dc231fe856

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index e7772e7..850a904 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -811,7 +811,8 @@
     restorecon("/dev/random");
     restorecon("/dev/urandom");
     restorecon("/dev/__properties__");
-    restorecon("/property_contexts");
+    restorecon("/plat_property_contexts");
+    restorecon("/nonplat_property_contexts");
     restorecon("/sys", SELINUX_ANDROID_RESTORECON_RECURSE);
     restorecon("/dev/block", SELINUX_ANDROID_RESTORECON_RECURSE);
     restorecon("/dev/device-mapper");