From 328cb5d14115b64c3b3fa04c4c44a0a6efb5cae5 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Wed, 18 Jan 2017 15:33:26 +0000
Subject: [PATCH] Revert "init: split property context into platform &
 non-platform components"

This reverts commit 871c306855a558963329fdb4a1b61f3e53c2b367.

Change-Id: I3e14b71e9fc5f37c9691405ce20031451643f9b4
---
 init/init.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/init/init.cpp b/init/init.cpp
index 078fa8a23..ee5add898 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -775,8 +775,7 @@ int main(int argc, char** argv) {
     restorecon("/dev/random");
     restorecon("/dev/urandom");
     restorecon("/dev/__properties__");
-    restorecon("/plat_property_contexts");
-    restorecon("/nonplat_property_contexts");
+    restorecon("/property_contexts");
     restorecon("/sys", SELINUX_ANDROID_RESTORECON_RECURSE);
     restorecon("/dev/block", SELINUX_ANDROID_RESTORECON_RECURSE);
     restorecon("/dev/device-mapper");