From d4186e8c1f74766d0be99f6f2e220ad64934fff3 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Fri, 21 Mar 2014 16:31:33 -0700 Subject: [PATCH] Make the zygote 64-bit for the x86-64 emulator. Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0 --- target/board/generic_x86_64/device.mk | 3 ++- target/product/full_x86_64.mk | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/target/board/generic_x86_64/device.mk b/target/board/generic_x86_64/device.mk index 089f5848d..5b002bda9 100755 --- a/target/board/generic_x86_64/device.mk +++ b/target/board/generic_x86_64/device.mk @@ -25,7 +25,8 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ - device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml + device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ + system/core/rootdir/init.zygote64.rc:root/init.zygote64.rc PRODUCT_PACKAGES := \ audio.primary.goldfish \ diff --git a/target/product/full_x86_64.mk b/target/product/full_x86_64.mk index 8b964c2de..ce5dcf70a 100755 --- a/target/product/full_x86_64.mk +++ b/target/product/full_x86_64.mk @@ -23,6 +23,9 @@ # that isn't a wifi connection. This will instruct init.rc to enable the # network connection so that you can use it with ADB +# Override and force 64-bit Zygote. Must come first. +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64 + $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) -- 2.11.0