diff options
| author | Andrew Chant <achant@google.com> | 2022-07-14 00:55:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-07-14 00:55:06 +0000 |
| commit | 5db0449a87481a9aeef898413d668cf48a38ddd3 (patch) | |
| tree | 96c384fe0441f8185323dc6e2b8e5d8bb68f0928 | |
| parent | 6bc4d48268f62ead894cad32713659fa43a0b49f (diff) | |
| parent | 5fcd22acc7abbb692c0f0129394ac85f478935f9 (diff) | |
| download | core-5db0449a87481a9aeef898413d668cf48a38ddd3.tar.gz | |
Merge "Add support for only starting 64 bit zygote." into tm-d1-dev am: 5fcd22acc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/19272483
Change-Id: Ie2a189e55f5359d3b74542b8a364124fbc0d0b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | rootdir/init.rc | 16 | ||||
| -rw-r--r-- | rootdir/init.zygote64_32.rc | 1 |
2 files changed, 12 insertions, 5 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index cd71aa8aa..870a97b55 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -823,7 +823,6 @@ on post-fs-data mkdir /data/misc/odsign 0710 root system # directory used for odsign metrics mkdir /data/misc/odsign/metrics 0770 root system - # Directory for VirtualizationService temporary image files. # Delete any stale files owned by the old virtualizationservice uid (b/230056726). chmod 0770 /data/misc/virtualizationservice @@ -1030,8 +1029,7 @@ on zygote-start && property:ro.crypto.state=unencrypted exec_start update_verifier_nonencrypted start statsd start netd - start zygote - start zygote_secondary + trigger zygote-run on zygote-start && property:ro.crypto.state=unsupported wait_for_prop odsign.verification.done 1 @@ -1039,8 +1037,7 @@ on zygote-start && property:ro.crypto.state=unsupported exec_start update_verifier_nonencrypted start statsd start netd - start zygote - start zygote_secondary + trigger zygote-run on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file wait_for_prop odsign.verification.done 1 @@ -1048,6 +1045,15 @@ on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type exec_start update_verifier_nonencrypted start statsd start netd + trigger zygote-run + +on zygote-run && property:ro.zygote=zygote32 + start zygote + +on zygote-run && property:ro.zygote=zygote64 + start zygote + +on zygote-run && property:ro.zygote=zygote64_32 start zygote start zygote_secondary diff --git a/rootdir/init.zygote64_32.rc b/rootdir/init.zygote64_32.rc index efb30d664..dfe16454c 100644 --- a/rootdir/init.zygote64_32.rc +++ b/rootdir/init.zygote64_32.rc @@ -25,3 +25,4 @@ service zygote_secondary /system/bin/app_process32 -Xzygote /system/bin --zygote socket usap_pool_secondary stream 660 root system onrestart restart zygote task_profiles ProcessCapacityHigh MaxPerformance + disabled |