From cc527e289971144c8e227b32707108efe0342c59 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Thu, 20 Feb 2020 18:19:00 -0800 Subject: [PATCH] emulator: switch x86* to 5.4 kernel Bug: 147493341 Test: boot Change-Id: Iad0ce71c34cc55c858b24598120bf01d91e10aa1 Signed-off-by: Roman Kiryanov --- build/sdk-android-x86.atree | 2 +- build/sdk-android-x86_64.atree | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/sdk-android-x86.atree b/build/sdk-android-x86.atree index da92d9ef3..913fce0b8 100644 --- a/build/sdk-android-x86.atree +++ b/build/sdk-android-x86.atree @@ -14,7 +14,7 @@ # limitations under the License. # -prebuilts/qemu-kernel/x86_64/4.14/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64 +prebuilts/qemu-kernel/x86_64/5.4/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64 device/generic/goldfish/data/etc/encryptionkey.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/encryptionkey.img # version files for the SDK updater, from development.git diff --git a/build/sdk-android-x86_64.atree b/build/sdk-android-x86_64.atree index d78bfb4c8..0b2202ed1 100644 --- a/build/sdk-android-x86_64.atree +++ b/build/sdk-android-x86_64.atree @@ -14,7 +14,7 @@ # limitations under the License. # -prebuilts/qemu-kernel/${TARGET_ARCH}/4.14/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu +prebuilts/qemu-kernel/${TARGET_ARCH}/5.4/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu device/generic/goldfish/data/etc/encryptionkey.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/encryptionkey.img # version files for the SDK updater, from development.git