Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fa3f861 authored by Christopher Ferris's avatar Christopher Ferris
Browse files

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

This reverts commit da94c7f6.

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
parent da94c7f6

rootdir/init.rc

+5 −11
Original line number Diff line number Diff line
@@ -827,6 +827,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.

    mkdir /data/misc/virtualizationservice 0700 virtualizationservice virtualizationservice
@@ -1030,7 +1031,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
@@ -1038,7 +1040,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
@@ -1046,15 +1049,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

rootdir/init.zygote64_32.rc

+0 −1
Original line number Diff line number Diff line
@@ -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