diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-01 16:29:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-01 16:29:57 +0000 |
| commit | 6a949b45e9166bcd4fc4b18e795085126a937c7b (patch) | |
| tree | f47b493465a36c919161eaae44361412a482d2ea /rootdir | |
| parent | 05b0d848b890181e5782b39988a167eda7558554 (diff) | |
| parent | ffca173c853a2e312610d87f40957f696ac8364a (diff) | |
| download | system_core-6a949b45e9166bcd4fc4b18e795085126a937c7b.zip system_core-6a949b45e9166bcd4fc4b18e795085126a937c7b.tar.gz system_core-6a949b45e9166bcd4fc4b18e795085126a937c7b.tar.bz2 | |
am ffca173c: am 5da2dbbc: Merge "Move zygote init config to its own file."
* commit 'ffca173c853a2e312610d87f40957f696ac8364a':
Move zygote init config to its own file.
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 9 | ||||
| -rw-r--r-- | rootdir/init.zygote32.rc | 8 | ||||
| -rw-r--r-- | rootdir/init.zygote64.rc | 8 |
3 files changed, 17 insertions, 8 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 28b349c..63d7e9b 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -7,6 +7,7 @@ import /init.environ.rc import /init.usb.rc import /init.${ro.hardware}.rc +import /init.${ro.zygote}.rc import /init.trace.rc on early-init @@ -523,14 +524,6 @@ service surfaceflinger /system/bin/surfaceflinger group graphics drmrpc onrestart restart zygote -service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-system-server - class main - socket zygote stream 660 root system - onrestart write /sys/android_power/request_state wake - onrestart write /sys/power/state on - onrestart restart media - onrestart restart netd - service drm /system/bin/drmserver class main user drm diff --git a/rootdir/init.zygote32.rc b/rootdir/init.zygote32.rc new file mode 100644 index 0000000..75961e6 --- /dev/null +++ b/rootdir/init.zygote32.rc @@ -0,0 +1,8 @@ +service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-system-server + class main + socket zygote stream 660 root system + onrestart write /sys/android_power/request_state wake + onrestart write /sys/power/state on + onrestart restart media + onrestart restart netd + diff --git a/rootdir/init.zygote64.rc b/rootdir/init.zygote64.rc new file mode 100644 index 0000000..afb6d63 --- /dev/null +++ b/rootdir/init.zygote64.rc @@ -0,0 +1,8 @@ +service zygote /system/bin/app_process64 -Xzygote /system/bin --zygote --start-system-server + class main + socket zygote stream 660 root system + onrestart write /sys/android_power/request_state wake + onrestart write /sys/power/state on + onrestart restart media + onrestart restart netd + |