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

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

This commit is contained in:
TreeHugger Robot 2018-04-17 05:22:35 +00:00 committed by Android (Google) Code Review
parent 0dd11dc0b5 dfa8e7796b
commit 6bb69c4c3d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/board/generic/BoardConfig.mk
View File

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

2
target/product/aosp_arm.mk
View File

@ -22,7 +22,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
# see copy file rules in core/Makefile # see copy file rules in core/Makefile
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ 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 device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
include $(SRC_TARGET_DIR)/product/full.mk include $(SRC_TARGET_DIR)/product/full.mk

2
target/product/sdk_phone_armv7.mk
View File

@ -22,7 +22,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
# see copy file rules in core/Makefile # see copy file rules in core/Makefile
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ 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 device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)