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

Commit a8954982 authored by Christopher Ferris's avatar Christopher Ferris Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Add support for only starting 64 bit zygote."" am: 86cc51ae am: e6c462d2 am: e98aa451 am: 02ad85d3 am: 0732e756

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



Change-Id: Iaf1b5aab05d68cafa9777c277e4f2386ad688212
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c36e9e75 0732e756

rootdir/init.rc

+5 −11
Original line number Original line Diff line number Diff line
@@ -832,6 +832,7 @@ on post-fs-data 
    mkdir /data/misc/odsign 0710 root system

    mkdir /data/misc/odsign 0710 root system

    # directory used for odsign metrics

    # directory used for odsign metrics

    mkdir /data/misc/odsign/metrics 0770 root system

    mkdir /data/misc/odsign/metrics 0770 root system



    # Directory for VirtualizationService temporary image files.

    # Directory for VirtualizationService temporary image files.

    # Delete any stale files owned by the old virtualizationservice uid (b/230056726).

    # Delete any stale files owned by the old virtualizationservice uid (b/230056726).

    chmod 0770 /data/misc/virtualizationservice

    chmod 0770 /data/misc/virtualizationservice
@@ -1040,7 +1041,8 @@ on zygote-start && property:ro.crypto.state=unencrypted 
    exec_start update_verifier_nonencrypted

    exec_start update_verifier_nonencrypted

    start statsd

    start statsd

    start netd

    start netd

    trigger zygote-run

    start zygote

    start zygote_secondary





on zygote-start && property:ro.crypto.state=unsupported

on zygote-start && property:ro.crypto.state=unsupported

    wait_for_prop odsign.verification.done 1

    wait_for_prop odsign.verification.done 1
@@ -1048,7 +1050,8 @@ on zygote-start && property:ro.crypto.state=unsupported 
    exec_start update_verifier_nonencrypted

    exec_start update_verifier_nonencrypted

    start statsd

    start statsd

    start netd

    start netd

    trigger zygote-run

    start zygote

    start zygote_secondary





on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file

on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file

    wait_for_prop odsign.verification.done 1

    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

    exec_start update_verifier_nonencrypted

    start statsd

    start statsd

    start netd

    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

    start zygote_secondary

    start zygote_secondary

rootdir/init.zygote64_32.rc

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

    socket usap_pool_secondary stream 660 root system

    onrestart restart zygote

    onrestart restart zygote

    task_profiles ProcessCapacityHigh MaxPerformance
 
    task_profiles ProcessCapacityHigh MaxPerformance
 
    disabled