commit 8d521ec2c8cf9bf6707c3fbf8ca6fc96868d2630
author Jiyong Park <jiyong@google.com> Mon Jun 22 19:54:44 2020 +0900
committer Jiyong Park <jiyong@google.com> Tue Jun 30 18:44:17 2020 +0900
tree f38326bf2ed0729dce009d9a92e40cff18c02a9c
parent 8b266f16a90d072dc47415b9332782a0a86292a4

ro.zygote in base_system.mk is optional

The setting of ro.zygote in base_system.mk is optional, which means the
value can be overriden by other (probably more specific) mk files.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
(cherry picked from commit b1261aac333e9980842af1120a4af747130e9f03)
Change-Id: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index bec550b..f6770fb 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -348,7 +348,7 @@
 endif
 
 PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc
-PRODUCT_SYSTEM_PROPERTIES += ro.zygote=zygote32
+PRODUCT_SYSTEM_PROPERTIES += ro.zygote?=zygote32
 
 PRODUCT_SYSTEM_PROPERTIES += debug.atrace.tags.enableflags=0