From d2a600eb35f1e7bb6e95325446010dffd6e6394f Mon Sep 17 00:00:00 2001
From: Tom Cherry <tomcherry@google.com>
Date: Fri, 21 Aug 2015 12:35:14 -0700
Subject: [PATCH] update bundled rc files to their contents from
 rootdir/init.rc

Bug 23186545

Change-Id: Ieb03ba89db2dee0365ae346295207ddfd29bd2b7
(cherry picked from commit 297991b3248f1e15ccc6c775b9a12e62925095f3)
---
 gatekeeperd/Android.mk     | 1 +
 gatekeeperd/gatekeeperd.rc | 3 +++
 logd/logd.rc               | 1 +
 3 files changed, 5 insertions(+)
 create mode 100644 gatekeeperd/gatekeeperd.rc

diff --git a/gatekeeperd/Android.mk b/gatekeeperd/Android.mk
index 55b2d5eb9..3f7895554 100644
--- a/gatekeeperd/Android.mk
+++ b/gatekeeperd/Android.mk
@@ -36,6 +36,7 @@ LOCAL_SHARED_LIBRARIES := \
 	libkeystore_binder
 LOCAL_STATIC_LIBRARIES := libscrypt_static
 LOCAL_C_INCLUDES := external/scrypt/lib/crypto
+LOCAL_INIT_RC := gatekeeperd.rc
 include $(BUILD_EXECUTABLE)
 
 include $(call first-makefiles-under,$(LOCAL_PATH))
diff --git a/gatekeeperd/gatekeeperd.rc b/gatekeeperd/gatekeeperd.rc
new file mode 100644
index 000000000..3f1b92d80
--- /dev/null
+++ b/gatekeeperd/gatekeeperd.rc
@@ -0,0 +1,3 @@
+service gatekeeperd /system/bin/gatekeeperd /data/misc/gatekeeper
+    class late_start
+    user system
diff --git a/logd/logd.rc b/logd/logd.rc
index 498baecd5..da6a0bcd0 100644
--- a/logd/logd.rc
+++ b/logd/logd.rc
@@ -3,6 +3,7 @@ service logd /system/bin/logd
     socket logd stream 0666 logd logd
     socket logdr seqpacket 0666 logd logd
     socket logdw dgram 0222 logd logd
+    group root system
 
 service logd-reinit /system/bin/logd --reinit
     oneshot