Merge "Revert "Add support for only starting 64 bit zygote.""

This commit is contained in:
Christopher Ferris 2022-07-15 00:24:10 +00:00 committed by Gerrit Code Review
commit 86cc51ae60
2 changed files with 5 additions and 12 deletions

View file

@ -832,6 +832,7 @@ 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
@ -1040,7 +1041,8 @@ on zygote-start && property:ro.crypto.state=unencrypted
exec_start update_verifier_nonencrypted
start statsd
start netd
trigger zygote-run
start zygote
start zygote_secondary
on zygote-start && property:ro.crypto.state=unsupported
wait_for_prop odsign.verification.done 1
@ -1048,7 +1050,8 @@ on zygote-start && property:ro.crypto.state=unsupported
exec_start update_verifier_nonencrypted
start statsd
start netd
trigger zygote-run
start zygote
start zygote_secondary
on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file
wait_for_prop odsign.verification.done 1
@ -1056,15 +1059,6 @@ 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,4 +25,3 @@ 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