p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "emulator: use 4.4 kernel for x86 and x86_64"

This commit is contained in:
Treehugger Robot 2018-03-01 05:28:50 +00:00 committed by Gerrit Code Review
parent 690aaa95ad 856954ca6a
commit 01670eb141
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/product/aosp_x86.mk
View File

@ -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

2
target/product/aosp_x86_64.mk
View File

@ -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)

2
target/product/sdk_phone_x86.mk
View File

@ -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)

2
target/product/sdk_phone_x86_64.mk
View File

@ -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)