From 856954ca6a2e6012cfb5649513cdc6b54d35fb2b Mon Sep 17 00:00:00 2001 From: bohu Date: Wed, 28 Feb 2018 11:38:21 -0800 Subject: [PATCH] emulator: use 4.4 kernel for x86 and x86_64 BUG: 72886167 Test: build aosp_x86 and aosp_x86_64 emulator boots complete Change-Id: I388a775fe50ca60c938b097faf6bf4296d5c9a54 --- target/product/aosp_x86.mk | 2 +- target/product/aosp_x86_64.mk | 2 +- target/product/sdk_phone_x86.mk | 2 +- target/product/sdk_phone_x86_64.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/product/aosp_x86.mk b/target/product/aosp_x86.mk index 811c33027f..96c9e33d2e 100644 --- a/target/product/aosp_x86.mk +++ b/target/product/aosp_x86.mk @@ -24,7 +24,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_COPY_FILES += \ development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ - prebuilts/qemu-kernel/x86_64/3.18/kernel-qemu2:kernel-ranchu-64 + prebuilts/qemu-kernel/x86_64/4.4/kernel-qemu2:kernel-ranchu-64 include $(SRC_TARGET_DIR)/product/full_x86.mk diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index 693bdaf0b0..086a76fb67 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -25,7 +25,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_COPY_FILES += \ development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ - prebuilts/qemu-kernel/x86_64/3.18/kernel-qemu2:kernel-ranchu + prebuilts/qemu-kernel/x86_64/4.4/kernel-qemu2:kernel-ranchu $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk index b9820d3e27..32d71eba9a 100644 --- a/target/product/sdk_phone_x86.mk +++ b/target/product/sdk_phone_x86.mk @@ -24,7 +24,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_COPY_FILES += \ development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ - prebuilts/qemu-kernel/x86_64/3.18/kernel-qemu2:kernel-ranchu-64 + prebuilts/qemu-kernel/x86_64/4.4/kernel-qemu2:kernel-ranchu-64 $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk index a18c4f8864..e40ebb53f5 100644 --- a/target/product/sdk_phone_x86_64.mk +++ b/target/product/sdk_phone_x86_64.mk @@ -25,7 +25,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_COPY_FILES += \ development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ - prebuilts/qemu-kernel/x86_64/3.18/kernel-qemu2:kernel-ranchu + prebuilts/qemu-kernel/x86_64/4.4/kernel-qemu2:kernel-ranchu $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)