From 50e6251baa5add93faea5d487fa3a2da61dc2977 Mon Sep 17 00:00:00 2001 From: Isaac Chen Date: Tue, 3 Apr 2018 11:06:12 +0800 Subject: [PATCH] ARM emulator: aosp_arm on 64-bit binder and kernel Starting in P, all 32-bit and 64-bit architectures use 64-bit binder interface. This is similar to ag/3576770 for x86. Bug: 71861550 Test: the following products can boot to home screen successfully: lunch aosp_arm-userdebug; m -j; emulator lunch sdk_phone_armv7-userdebug; m -j; emulator Change-Id: Ibe1f53a5798342555e2e84395a13b48d461f483d Merged-In: Ibe1f53a5798342555e2e84395a13b48d461f483d (cherry picked from commit 6f114c0110c466d2a117f3e531f9ea5170a121ee) --- target/board/generic/BoardConfig.mk | 2 ++ target/product/aosp_arm.mk | 2 +- target/product/sdk_phone_armv7.mk | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 9bf3c8bed5..361f252085 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -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 diff --git a/target/product/aosp_arm.mk b/target/product/aosp_arm.mk index 820e392558..c66f95401a 100644 --- a/target/product/aosp_arm.mk +++ b/target/product/aosp_arm.mk @@ -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 diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk index 09e5c756fc..73c42c381d 100644 --- a/target/product/sdk_phone_armv7.mk +++ b/target/product/sdk_phone_armv7.mk @@ -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)