commit deb4fcaea4f5e0138df527bf74e3fe019edc1cc5
author Sandeep Patil <sspatil@google.com> Wed Jan 18 06:32:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 06:32:26 2017 +0000
tree 2879b25982365ea90a36451a471e24573623c663
parent 1412c04088c0a2288884ca7387288af68ad89ad7
parent cefeec0d00e7718a1638c74769107c90327ea572

init: split property context into platform & non-platform components am: 871c306855 am: ca1bcdb286 am: 4bf0a38e72
am: e60a203ec5

Change-Id: I77f9c8229598bfe89e76c486b720e2e7d98e686f

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index ee5add8..078fa8a 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -775,7 +775,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");