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

Commit 31379553 authored by Isaac Chen's avatar Isaac Chen Committed by android-build-merger
Browse files

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

am: 6bb69c4c

Change-Id: I492a34654f88a2191f23160722461b9cd85af4b0
parents cd91406e 6bb69c4c

target/board/generic/BoardConfig.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

target/product/aosp_arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

target/product/sdk_phone_armv7.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)