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

Commit ff39b2ee authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove mainline boot.img from GSI targets" into sc-dev am: e77729e0 

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

Change-Id: I0ef97f28d5a48fabb61f09b2be022f98a80bc630
parents 96770d63 e77729e0

target/board/generic_arm64/BoardConfig.mk

+0 −4
Original line number Diff line number Diff line
@@ -68,9 +68,6 @@ BOARD_KERNEL-5.10-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920 
BOARD_KERNEL-5.10-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920

BOARD_KERNEL-5.10-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376

BOARD_KERNEL-5.10-LZ4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 53477376

BOARD_KERNEL-MAINLINE_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-MAINLINE-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920

BOARD_KERNEL-MAINLINE-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376



BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
@@ -78,7 +75,6 @@ BOARD_KERNEL_BINARIES := \ 
    kernel-4.19-gz \

    kernel-5.4 kernel-5.4-gz kernel-5.4-lz4 \

    kernel-5.10 kernel-5.10-gz kernel-5.10-lz4 \

    kernel-mainline kernel-mainline-gz kernel-mainline-lz4 \



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

BOARD_KERNEL_BINARIES += \

target/board/generic_arm64/device.mk

+0 −4
Original line number Diff line number Diff line
@@ -22,14 +22,10 @@ PRODUCT_COPY_FILES += \ 
    kernel/prebuilts/5.10/arm64/kernel-5.10:kernel-5.10 \

    kernel/prebuilts/5.10/arm64/kernel-5.10-gz:kernel-5.10-gz \

    kernel/prebuilts/5.10/arm64/kernel-5.10-lz4:kernel-5.10-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 \



$(call dist-for-goals, dist_files, kernel/prebuilts/4.19/arm64/prebuilt-info.txt:kernel/4.19/prebuilt-info.txt)

$(call dist-for-goals, dist_files, kernel/prebuilts/5.4/arm64/prebuilt-info.txt:kernel/5.4/prebuilt-info.txt)

$(call dist-for-goals, dist_files, kernel/prebuilts/5.10/arm64/prebuilt-info.txt:kernel/5.10/prebuilt-info.txt)

$(call dist-for-goals, dist_files, kernel/prebuilts/mainline/arm64/prebuilt-info.txt:kernel/mainline/prebuilt-info.txt)



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

PRODUCT_COPY_FILES += \