commit e7236518407a7ae2b026f862c29c9b02a96fc01c
author Dimitry Ivanov <dimitry@google.com> Mon May 02 21:39:09 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 02 21:39:09 2016 +0000
tree f90b97d94d5ac7b14f4d059c217ee657a193bc63
parent b00141d2fc7d1db75d1e3e6fde0ceadf98b9b5ea
parent 3174bda7ac07465400a4b38b272ebe5126212ba6

Merge "nativeloader: Add Reset capabilities" into nyc-dev
am: 3174bda7ac

* commit '3174bda7ac07465400a4b38b272ebe5126212ba6':
  nativeloader: Add Reset capabilities

Change-Id: Ibf410033e22a681f47d9adccec5713fa995b577b

rootdir/init.zygote32_64.rc

diff --git a/rootdir/init.zygote32_64.rc b/rootdir/init.zygote32_64.rc
index 555eda4..b50fe46 100644
--- a/rootdir/init.zygote32_64.rc
+++ b/rootdir/init.zygote32_64.rc
@@ -7,7 +7,7 @@
     onrestart restart cameraserver
     onrestart restart media
     onrestart restart netd
-    writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks
+    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
 
 service zygote_secondary /system/bin/app_process64 -Xzygote /system/bin --zygote --socket-name=zygote_secondary
     class main

rootdir/init.zygote64_32.rc

diff --git a/rootdir/init.zygote64_32.rc b/rootdir/init.zygote64_32.rc
index 46f9f02..615fe66 100644
--- a/rootdir/init.zygote64_32.rc
+++ b/rootdir/init.zygote64_32.rc
@@ -7,7 +7,7 @@
     onrestart restart cameraserver
     onrestart restart media
     onrestart restart netd
-    writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks
+    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
 
 service zygote_secondary /system/bin/app_process32 -Xzygote /system/bin --zygote --socket-name=zygote_secondary
     class main