From 8d521ec2c8cf9bf6707c3fbf8ca6fc96868d2630 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 22 Jun 2020 19:54:44 +0900 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index bec550bc24..f6770fb69b 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -348,7 +348,7 @@ PRODUCT_BOOT_JARS += android.test.base 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