commit c54d7f2148f73babe63d225bbb39934f646f241a
author Narayan Kamath <narayan@google.com> Tue Apr 01 18:33:37 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 01 18:33:37 2014 +0000
tree d156162ba97dd9aff0f7227c7602848ba52bb8ca
parent 923f21d90324bceafa32e03757638669e73731d6
parent b6cc84212875fda1b8d2ccc0a66fc6a2169933d9

am b6cc8421: am 2c9552b7: am aafbbe7e: Merge "Add a default value for ro.zygote."

* commit 'b6cc84212875fda1b8d2ccc0a66fc6a2169933d9':
  Add a default value for ro.zygote.

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index e13e59b..7fbdee6 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -82,4 +82,9 @@
 PRODUCT_RUNTIMES := runtime_libart_default
 PRODUCT_RUNTIMES += runtime_libdvm
 
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    ro.zygote=zygote32
+PRODUCT_COPY_FILES += \
+    system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc
+
 $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)