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

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

Merge "emulator: use 4.9 kernel" into pi-dev 

am: 6181ffa9

Change-Id: Ie0519d1c859d257c59ed0a57b4c3756507b58ddd
parents 3f4c246c 6181ffa9

target/product/aosp_x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -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/4.4/kernel-qemu2:kernel-ranchu-64

    prebuilts/qemu-kernel/x86_64/4.9/kernel-qemu2:kernel-ranchu-64



include $(SRC_TARGET_DIR)/product/full_x86.mk

target/product/aosp_x86_64.mk

+1 −1
Original line number Diff line number Diff line
@@ -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/4.4/kernel-qemu2:kernel-ranchu

    prebuilts/qemu-kernel/x86_64/4.9/kernel-qemu2:kernel-ranchu



# Copy different zygote settings for vendor.img to select by setting property

# ro.zygote=zygote64_32 or ro.zygote=zygote32_64:

target/product/sdk_phone_x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -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/4.4/kernel-qemu2:kernel-ranchu-64

    prebuilts/qemu-kernel/x86_64/4.9/kernel-qemu2:kernel-ranchu-64



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

target/product/sdk_phone_x86_64.mk

+1 −1
Original line number Diff line number Diff line
@@ -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/4.4/kernel-qemu2:kernel-ranchu

    prebuilts/qemu-kernel/x86_64/4.9/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)