commit 8436885c859490c767d47661ee9e22fa9f3ec990
author Elliott Hughes <enh@google.com> Wed May 11 18:02:51 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 11 18:02:51 2016 +0000
tree 640bf61fd977f2dc722a38349b42ece9926e8efc
parent 08dabcf31200972922c5345bd3c463200cfd9d5a
parent f0503c3c685d8cc34393aa5826e0467a658c6e85

Merge "Add a fortify test to crasher." am: e674d32d2d am: 4434b42cd0
am: 69541606c1

* commit '69541606c1a6b6e1ee8b3b59fa5d592aee3e6851':
  Add a fortify test to crasher.

Change-Id: I62e668bb7d7b07fbc7f84543714ba37aee5c27c0

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