Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c2ae327 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary." 

* commit '8d3b9c9e':
  Switch x86_64 emulator to 64 bit primary.
parents 0f99bb3d 8d3b9c9e

CleanSpec.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -223,6 +223,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
# Unset TARGET_PREFER_32_BIT_APPS for 64 bit targets.

# Unset TARGET_PREFER_32_BIT_APPS for 64 bit targets.

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)





# Switching the x86 emulator over to a 64 bit primary zygote.

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)



# ************************************************

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************
 
# ************************************************

target/board/generic_x86_64/device.mk

+1 −2
Original line number Original line Diff line number Diff line
@@ -25,8 +25,7 @@ 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 \

target/product/full_x86_64.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,10 @@ 
# 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





PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32

PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc





$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(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)