commit 20cd501c2b016381c88c8a71bd9ef69812c7def8
author Dimitry Ivanov <dimitry@google.com> Fri May 06 22:08:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 06 22:08:06 2016 +0000
tree b04d648805279dfde9e0a71dab074b6eb0aceca3
parent 25fe8a8b33f3e2f97906576ceadf1ae925fecca7
parent d2df05be5e5d827e9e356b8aac8f9b724f032e27

Merge "Add public libs from an environment variable" into nyc-dev am: ea41a18c93
am: b91425132e

* commit 'b91425132edcb27c76a25d8bd3260a2460266d51':
  Add public libs from an environment variable

Change-Id: I3840dbc4748cc7073bc6f0676f8163418e133a5c

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