Merge "ARM emulator: aosp_arm on 64-bit binder and kernel"

am: a0f595ec69

Change-Id: Ic98cd7a1a8615925d3775aefaedf7d0f065af4a5
This commit is contained in:
Isaac Chen 2018-04-24 06:42:30 -07:00 committed by android-build-merger
commit 68ea56253b
3 changed files with 4 additions and 2 deletions

View File

@ -27,6 +27,8 @@ HAVE_HTC_AUDIO_DRIVER := true
BOARD_USES_GENERIC_AUDIO := true
TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH)
TARGET_USES_64_BIT_BINDER := true
# no hardware camera
USE_CAMERA_STUB := true

View File

@ -22,7 +22,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
# see copy file rules in core/Makefile
PRODUCT_COPY_FILES += \
development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \
prebuilts/qemu-kernel/arm/3.18/kernel-qemu2:kernel-ranchu \
prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu-64 \
device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
include $(SRC_TARGET_DIR)/product/full.mk

View File

@ -22,7 +22,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
# see copy file rules in core/Makefile
PRODUCT_COPY_FILES += \
development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \
prebuilts/qemu-kernel/arm/3.18/kernel-qemu2:kernel-ranchu \
prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu-64 \
device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)