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

Commit e468a9fd authored by Steve Muckle's avatar Steve Muckle Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "use new GKI kernel location"" am: a5e1dc4b am: 42311728 am: c9eefe4a 

Original change: https://android-review.googlesource.com/c/platform/build/+/1455798

Change-Id: I69a16b64717049803bb36bc1dbe5ae0f320e38c3
parents 6ff29067 c9eefe4a

target/board/emulator_arm64/device.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 := device/google/cuttlefish_kernel/5.4-arm64/kernel

    LOCAL_KERNEL := kernel/prebuilts/5.4/arm64/kernel-5.4-lz4

else

    LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)

endif

target/board/generic_arm64/device.mk

+9 −9
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 


PRODUCT_COPY_FILES += \

    kernel/prebuilts/4.19/arm64/Image.gz:kernel-4.19-gz \

    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

    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



ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

PRODUCT_COPY_FILES += \

    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

    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

endif