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

Commit 7e41fb46 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "emulator: enable 32bit x86 to run on 64bit kernel"

parents 13f228eb 1695288d

target/board/generic_x86/BoardConfig.mk

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ TARGET_ARCH := x86 
TARGET_ARCH_VARIANT := x86

TARGET_PRELINK_MODULE := false



#emulator now uses 64bit kernel to run 32bit x86 image

#

TARGET_USES_64_BIT_BINDER := true



# The IA emulator (qemu) uses the Goldfish devices

HAVE_HTC_AUDIO_DRIVER := true

BOARD_USES_GENERIC_AUDIO := true

target/product/aosp_x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini:advancedFeatures.ini \

    device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \

    prebuilts/qemu-kernel/x86/3.18/kernel-qemu2:kernel-ranchu

    prebuilts/qemu-kernel/x86_64/3.18/kernel-qemu2:kernel-ranchu-64



include $(SRC_TARGET_DIR)/product/full_x86.mk

target/product/sdk_phone_x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini:advancedFeatures.ini \

    device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \

    prebuilts/qemu-kernel/x86/3.18/kernel-qemu2:kernel-ranchu

    prebuilts/qemu-kernel/x86_64/3.18/kernel-qemu2:kernel-ranchu-64



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