Merge "Make the zygote 64-bit for the x86-64 emulator."
This commit is contained in:
commit
850299f6a6
2 changed files with 5 additions and 1 deletions
|
@ -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 \
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue