From 50df6f59345d18dddc413b81293a00fc716b8f95 Mon Sep 17 00:00:00 2001 From: Isaac Chen Date: Thu, 12 Apr 2018 16:29:58 +0800 Subject: [PATCH] emulator: 64-bit kernel for 32-bit arm image Starting in P, all 32-bit and 64-bit architectures use 64-bit binder interface. This is similar to ag/3582011 for x86. Bug: 71861550 Test: lunch sdk_phone_armv7-userdebug; m -j; emulator Change-Id: I152a89ba46e81f27bde0e166cb224d2a740fc989 --- build/sdk-android-armeabi-v7a.atree | 2 +- build/sdk-android-armeabi.atree | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/sdk-android-armeabi-v7a.atree b/build/sdk-android-armeabi-v7a.atree index a59f323b6..d488c95ce 100644 --- a/build/sdk-android-armeabi-v7a.atree +++ b/build/sdk-android-armeabi-v7a.atree @@ -15,7 +15,7 @@ # # Copy the ARMv7 specific kernel image to .../kernel-qemu -prebuilts/qemu-kernel/${TARGET_ARCH}/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu +prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64 # version files for the SDK updater, from development.git ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi-v7a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties diff --git a/build/sdk-android-armeabi.atree b/build/sdk-android-armeabi.atree index 124589239..90afc82eb 100644 --- a/build/sdk-android-armeabi.atree +++ b/build/sdk-android-armeabi.atree @@ -15,7 +15,7 @@ # prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu -prebuilts/qemu-kernel/${TARGET_ARCH}/ranchu/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu +prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64 # version files for the SDK updater, from development.git ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties