StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
BUG: 71861550
Change-Id: Iea8fae11375d66a141babd40f66dd2e3da6075e0
This commit is contained in:
bohu
2018-01-18 11:08:15 -08:00
committed by Bo Hu
parent 57923be123
commit 1695288dc0
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/board/generic_x86/BoardConfig.mk
View File

@@ -11,6 +11,10 @@ TARGET_ARCH := x86
TARGET_ARCH_VARIANT := x86 TARGET_ARCH_VARIANT := x86
TARGET_PRELINK_MODULE := false 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 # The IA emulator (qemu) uses the Goldfish devices
HAVE_HTC_AUDIO_DRIVER := true HAVE_HTC_AUDIO_DRIVER := true
BOARD_USES_GENERIC_AUDIO := true BOARD_USES_GENERIC_AUDIO := true

2
target/product/aosp_x86.mk
View File

@@ -24,7 +24,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ development/sys-img/advancedFeatures.ini:advancedFeatures.ini \
device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ 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 include $(SRC_TARGET_DIR)/product/full_x86.mk

2
target/product/sdk_phone_x86.mk
View File

@@ -24,7 +24,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ development/sys-img/advancedFeatures.ini:advancedFeatures.ini \
device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ 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) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)