tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am f1d5dcdd: am 850299f6: Merge "Make the zygote 64-bit for the x86-64 emulator."

Browse source 
* commit 'f1d5dcdd30e1f181cc1fce6d99f0f3aa589c8edd':
  Make the zygote 64-bit for the x86-64 emulator.
This commit is contained in:
Ian Rogers 2014-04-22 15:45:44 +00:00 committed by Android Git Automerger
commit 77efd7b4cd
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
target/board/generic_x86_64/device.mk
View file

@ -25,7 +25,8 @@ PRODUCT_PROPERTY_OVERRIDES := \
PRODUCT_COPY_FILES := \ PRODUCT_COPY_FILES := \
device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ 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_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 := \ PRODUCT_PACKAGES := \
audio.primary.goldfish \ audio.primary.goldfish \

3
target/product/full_x86_64.mk
View file

@ -23,6 +23,9 @@
# that isn't a wifi connection. This will instruct init.rc to enable the # that isn't a wifi connection. This will instruct init.rc to enable the
# network connection so that you can use it with ADB # 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)/product/aosp_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)