From a0281768fe6578407c10754c852823ecf2040e4b Mon Sep 17 00:00:00 2001 From: Xiao Ma Date: Fri, 9 Oct 2020 07:22:45 +0000 Subject: [PATCH] Revert "use new GKI kernel location" Revert "Update kernel to builds 6888926" Revert submission 1454075-2020-10-07-gki-update Reason for revert: Looks like this topic changes caused daily build broken, the error log as: error: +out/target/product/emulator_arm64/boot.img too large (34934784 > 33484800) I tried to revert this topic first and then feel free to revert revert it. Reverted Changes: Ie74ca26e8:use new GKI kernel location Ibff0d9638:Update kernel to builds 6889747 I693476e82:Update kernel to builds 6888926 I35d7f320c:Update kernel to builds 6888926 Id221a7a30:Update kernel to builds 6888926 I4421dbf67:remove kernel, kernel modules from cuttlefish_kern... I991f9a6af:Allow downstream devices to customize vendor modul... I598630e09:load kernel, kernel modules from updated locations... Bug: 170451791 Change-Id: I4d8f18a7c80eb92cb475c48e1dcf04ceabd08984 --- target/board/emulator_arm64/device.mk | 2 +- target/board/generic_arm64/device.mk | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/board/emulator_arm64/device.mk b/target/board/emulator_arm64/device.mk index 7c2c84e33e..73dc2f4c4f 100644 --- a/target/board/emulator_arm64/device.mk +++ b/target/board/emulator_arm64/device.mk @@ -19,7 +19,7 @@ PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps. # Cuttlefish has GKI kernel prebuilts, so use those for the GKI boot.img. ifeq ($(TARGET_PREBUILT_KERNEL),) - LOCAL_KERNEL := kernel/prebuilts/5.4/arm64/kernel-5.4 + LOCAL_KERNEL := device/google/cuttlefish_kernel/5.4-arm64/kernel else LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) endif diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index 6f1bba0e05..1585fbd894 100644 --- a/target/board/generic_arm64/device.mk +++ b/target/board/generic_arm64/device.mk @@ -16,16 +16,16 @@ PRODUCT_COPY_FILES += \ kernel/prebuilts/4.19/arm64/Image.gz:kernel-4.19-gz \ - kernel/prebuilts/5.4/arm64/kernel-5.4:kernel-5.4 \ - kernel/prebuilts/5.4/arm64/kernel-5.4-gz:kernel-5.4-gz \ - kernel/prebuilts/5.4/arm64/kernel-5.4-lz4:kernel-5.4-lz4 \ - kernel/prebuilts/mainline/arm64/kernel-mainline-allsyms:kernel-mainline \ - kernel/prebuilts/mainline/arm64/kernel-mainline-gz-allsyms:kernel-mainline-gz \ - kernel/prebuilts/mainline/arm64/kernel-mainline-lz4-allsyms:kernel-mainline-lz4 + device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4:kernel-5.4 \ + device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-gz:kernel-5.4-gz \ + device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-lz4:kernel-5.4-lz4 \ + kernel/prebuilts/mainline/arm64/kernel-mainline:kernel-mainline \ + kernel/prebuilts/mainline/arm64/kernel-mainline-gz:kernel-mainline-gz \ + kernel/prebuilts/mainline/arm64/kernel-mainline-lz4:kernel-mainline-lz4 ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ - kernel/prebuilts/5.4/arm64/kernel-5.4:kernel-5.4-allsyms \ - kernel/prebuilts/5.4/arm64/kernel-5.4-gz:kernel-5.4-gz-allsyms \ - kernel/prebuilts/5.4/arm64/kernel-5.4-lz4:kernel-5.4-lz4-allsyms + device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4:kernel-5.4-allsyms \ + device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-gz:kernel-5.4-gz-allsyms \ + device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-lz4:kernel-5.4-lz4-allsyms endif