p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "emulator: enable 32bit x86 to run on 64bit kernel" am: 7e41fb46db am: d7c34ffac8 

am: dbcfacd5f1

Change-Id: Ia2a5f2ad2d893abb1db7a9681e4360e34beab2f9
This commit is contained in:
bohu 2018-01-19 02:17:49 +00:00 committed by android-build-merger
parent 9daf3419ba dbcfacd5f1
commit 96e73cd33d
3 changed files with 6 additions and 2 deletions
Show Stats 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_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

2
target/product/aosp_x86.mk
View File

@ -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

2
target/product/sdk_phone_x86.mk
View File

@ -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)