Merge "Revert "Add support for only starting 64 bit zygote.""
diff --git a/rootdir/init.rc b/rootdir/init.rc
index a819c7a..660f18c 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -832,6 +832,7 @@
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 @@
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 @@
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 @@
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 dfe1645..efb30d6 100644
--- a/rootdir/init.zygote64_32.rc
+++ b/rootdir/init.zygote64_32.rc
@@ -25,4 +25,3 @@
socket usap_pool_secondary stream 660 root system
onrestart restart zygote
task_profiles ProcessCapacityHigh MaxPerformance
- disabled