ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit da94c7f650.

Reason for revert: It appears this change slows down boot on normal devices.

Technically, this change is not necessary, but it prevents starting the secondary and having it throw an error in the only run 64 bit zygote config. But it's easier to throw the error than slow down boot up.

Bug: 238971179

Test: Verified that on a 64 with 32 config, the secondary zygote
Test: starts but exits.
Change-Id: I7ab0496a402db83e70168d52e5d5911b82a3b06a
Merged-In: I7ab0496a402db83e70168d52e5d5911b82a3b06a
(cherry picked from commit 3fa3f861d4)
This commit is contained in:
Christopher Ferris 2022-07-14 21:53:47 +00:00
parent 2d4337f5bf
commit c5ad522fef
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rootdir/init.rc
View file

@ -823,6 +823,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
@ -1029,7 +1030,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
@ -1037,7 +1039,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
@ -1045,15 +1048,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

1
rootdir/init.zygote64_32.rc
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