diff options
| author | Christopher Ferris <cferris@google.com> | 2022-07-14 21:53:47 +0000 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2022-07-15 00:57:54 +0000 |
| commit | c5ad522fef9c02c918387c44e2b86c227630eee0 (patch) | |
| tree | 6281fa817bfa33bb873c68b53fdd5d2f008eaa6d | |
| parent | 2d4337f5bf497982b235b9c3fe8f35107e36da21 (diff) | |
| download | core-c5ad522fef9c02c918387c44e2b86c227630eee0.tar.gz | |
Revert "Add support for only starting 64 bit zygote."
This reverts commit da94c7f6501158de734171c0f62a486ac69ac8a9.
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 3fa3f861d4c091aa59a6b217a3306a5ba80284f6)
| -rw-r--r-- | rootdir/init.rc | 16 | ||||
| -rw-r--r-- | rootdir/init.zygote64_32.rc | 1 |
2 files changed, 5 insertions, 12 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 870a97b55..cd71aa8aa 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -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 diff --git a/rootdir/init.zygote64_32.rc b/rootdir/init.zygote64_32.rc index dfe16454c..efb30d664 100644 --- a/rootdir/init.zygote64_32.rc +++ b/rootdir/init.zygote64_32.rc @@ -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 |