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

Commit cc8ec5da authored by bohu's avatar bohu Committed by android-build-merger
Browse files

Merge "emulator: use 4.4 kernel for x86 and x86_64" am: 01670eb1 am: db14a186 

am: 82a75cd2

Change-Id: Iec85fd60c22ea79c999d288f94e90099472f0c53
parents 5ebbb19f 82a75cd2

target/product/aosp_x86.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
PRODUCT_COPY_FILES += \

PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini:advancedFeatures.ini \

    development/sys-img/advancedFeatures.ini:advancedFeatures.ini \

    device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \

    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

include $(SRC_TARGET_DIR)/product/full_x86.mk

target/product/aosp_x86_64.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
PRODUCT_COPY_FILES += \

PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini:advancedFeatures.ini \

    development/sys-img/advancedFeatures.ini:advancedFeatures.ini \

    device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \

    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/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

target/product/sdk_phone_x86.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
PRODUCT_COPY_FILES += \

PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini:advancedFeatures.ini \

    development/sys-img/advancedFeatures.ini:advancedFeatures.ini \

    device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \

    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)

$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)

target/product/sdk_phone_x86_64.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
PRODUCT_COPY_FILES += \

PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini:advancedFeatures.ini \

    development/sys-img/advancedFeatures.ini:advancedFeatures.ini \

    device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \

    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/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)