From 440efa57961c9264e8f99f8817bb9fa43ef1c1a4 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Thu, 17 Jan 2019 19:31:11 +0000 Subject: [PATCH] Delay zygote startup until after the Runtime APEX has been mounted. It depends on libdexfile_external, libnative{bridge,helper,loader} and libart(d), which are provided by the Runtime APEX. Test: flash & boot Test: atest CtsJdwpTestCases Bug: 113373927 Change-Id: I0df99f444e892c47a5f06bd1bcf5d184defb4517 --- rootdir/init.zygote32.rc | 1 + rootdir/init.zygote32_64.rc | 2 ++ rootdir/init.zygote64.rc | 1 + rootdir/init.zygote64_32.rc | 2 ++ 4 files changed, 6 insertions(+) diff --git a/rootdir/init.zygote32.rc b/rootdir/init.zygote32.rc index ac87979ec..2e9568776 100644 --- a/rootdir/init.zygote32.rc +++ b/rootdir/init.zygote32.rc @@ -4,6 +4,7 @@ service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-sys user root group root readproc reserved_disk socket zygote stream 660 root system + updatable onrestart write /sys/android_power/request_state wake onrestart write /sys/power/state on onrestart restart audioserver diff --git a/rootdir/init.zygote32_64.rc b/rootdir/init.zygote32_64.rc index a535846de..1cfc3d6cc 100644 --- a/rootdir/init.zygote32_64.rc +++ b/rootdir/init.zygote32_64.rc @@ -4,6 +4,7 @@ service zygote /system/bin/app_process32 -Xzygote /system/bin --zygote --start-s user root group root readproc reserved_disk socket zygote stream 660 root system + updatable onrestart write /sys/android_power/request_state wake onrestart write /sys/power/state on onrestart restart audioserver @@ -19,5 +20,6 @@ service zygote_secondary /system/bin/app_process64 -Xzygote /system/bin --zygote user root group root readproc reserved_disk socket zygote_secondary stream 660 root system + updatable onrestart restart zygote writepid /dev/cpuset/foreground/tasks diff --git a/rootdir/init.zygote64.rc b/rootdir/init.zygote64.rc index 6fc810bfa..8ab012dc7 100644 --- a/rootdir/init.zygote64.rc +++ b/rootdir/init.zygote64.rc @@ -4,6 +4,7 @@ service zygote /system/bin/app_process64 -Xzygote /system/bin --zygote --start-s user root group root readproc reserved_disk socket zygote stream 660 root system + updatable onrestart write /sys/android_power/request_state wake onrestart write /sys/power/state on onrestart restart audioserver diff --git a/rootdir/init.zygote64_32.rc b/rootdir/init.zygote64_32.rc index 7ddd52ee5..5abf149cd 100644 --- a/rootdir/init.zygote64_32.rc +++ b/rootdir/init.zygote64_32.rc @@ -4,6 +4,7 @@ service zygote /system/bin/app_process64 -Xzygote /system/bin --zygote --start-s user root group root readproc reserved_disk socket zygote stream 660 root system + updatable onrestart write /sys/android_power/request_state wake onrestart write /sys/power/state on onrestart restart audioserver @@ -19,5 +20,6 @@ service zygote_secondary /system/bin/app_process32 -Xzygote /system/bin --zygote user root group root readproc reserved_disk socket zygote_secondary stream 660 root system + updatable onrestart restart zygote writepid /dev/cpuset/foreground/tasks