diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-01 17:40:45 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-04-01 17:40:45 +0100 |
| commit | dc9af896f011698949cf9237094e52eaec9d4e8e (patch) | |
| tree | 08afd4e545ecd39bbd5cc5d013a2999b64355a64 /rootdir | |
| parent | 89086df24f7d8533369529fc016c5d7e04b62a32 (diff) | |
| parent | 6a949b45e9166bcd4fc4b18e795085126a937c7b (diff) | |
| download | system_core-dc9af896f011698949cf9237094e52eaec9d4e8e.zip system_core-dc9af896f011698949cf9237094e52eaec9d4e8e.tar.gz system_core-dc9af896f011698949cf9237094e52eaec9d4e8e.tar.bz2 | |
resolved conflicts for merge of 6a949b45 to master
Change-Id: Ie123b4fff76ef43e2b1c0583731e88997504320e
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 2423274..6a053b3 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 @@ -534,14 +535,6 @@ service inputflinger /system/bin/inputflinger group input 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 + |