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

Merge "Revert "Add support for only starting 64 bit zygote."" am: 86cc51ae60

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

Change-Id: Ic0251c315a947f5f810fe38c84650a528f892ab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Christopher Ferris 2022-07-15 00:34:51 +00:00 • committed by Automerger Merge Worker
commit e6c462d209
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

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

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