commit bcd32b8180ef28a930104f295b45d44cac1f688e
author Dimitry Ivanov <dimitry@google.com> Fri May 06 22:03:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 06 22:03:25 2016 +0000
tree 69d8f43f0063261b88b637bcf041cef55c88bf9c
parent 48738dee5c97a698df4256969beb7139d17cdf7d
parent b33214be60845c1e54b17033166fa9967070cd11

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

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

Change-Id: I69eeea4830f371c135ca62cc61864a0095e33d94

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