Merge "Add support for only starting 64 bit zygote." am: 1012626192

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2061509

Change-Id: I16d2104ef124cd3bee86923f36c80352117ff69f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2022-07-13 20:19:00 +00:00 committed by Automerger Merge Worker
commit 594a67ce35
2 changed files with 12 additions and 5 deletions

View file

@ -832,7 +832,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
@ -1041,8 +1040,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
@ -1050,8 +1048,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
@ -1059,6 +1056,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

View file

@ -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