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

Commit 36ebb662 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clean up gki-5.4 related rules in GSI" am: 389170f9 

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

Change-Id: I6db74dc855b814c00ee8cb90628b673633ae3d44
parents acdfa0f4 389170f9

target/board/generic_arm64/BoardConfig.mk

+0 −8
Original line number Diff line number Diff line
@@ -57,12 +57,6 @@ include build/make/target/board/BoardConfigGkiCommon.mk 


BOARD_KERNEL-4.19-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920

BOARD_KERNEL-4.19-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920

BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.4-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920

BOARD_KERNEL-5.4-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920

BOARD_KERNEL-5.4-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376

BOARD_KERNEL-5.4-LZ4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 53477376

BOARD_KERNEL-5.10_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.10-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.10-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920
@@ -74,13 +68,11 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 


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 \



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

BOARD_KERNEL_BINARIES += \

    kernel-4.19-gz-allsyms \

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

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



endif

target/board/generic_arm64/device.mk

+0 −7
Original line number Diff line number Diff line
@@ -16,23 +16,16 @@ 


PRODUCT_COPY_FILES += \

    kernel/prebuilts/4.19/arm64/kernel-4.19-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/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 \



$(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)



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

PRODUCT_COPY_FILES += \

    kernel/prebuilts/4.19/arm64/kernel-4.19-gz-allsyms:kernel-4.19-gz-allsyms \

    kernel/prebuilts/5.4/arm64/kernel-5.4-allsyms:kernel-5.4-allsyms \

    kernel/prebuilts/5.4/arm64/kernel-5.4-gz-allsyms:kernel-5.4-gz-allsyms \

    kernel/prebuilts/5.4/arm64/kernel-5.4-lz4-allsyms:kernel-5.4-lz4-allsyms \

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

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

    kernel/prebuilts/5.10/arm64/kernel-5.10-lz4-allsyms:kernel-5.10-lz4-allsyms \

target/board/generic_x86_64/BoardConfig.mk

+0 −3
Original line number Diff line number Diff line
@@ -28,19 +28,16 @@ ifdef BUILDING_GSI 
include build/make/target/board/BoardConfigGkiCommon.mk



BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.10_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.10-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864



BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800



BOARD_KERNEL_BINARIES := \

    kernel-5.4 \

    kernel-5.10 \



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

BOARD_KERNEL_BINARIES += \

    kernel-5.4-allsyms \

    kernel-5.10-allsyms \



endif

target/board/generic_x86_64/device.mk

+0 −3
Original line number Diff line number Diff line
@@ -15,15 +15,12 @@ 
#



PRODUCT_COPY_FILES += \

    kernel/prebuilts/5.4/x86_64/kernel-5.4:kernel-5.4 \

    kernel/prebuilts/5.10/x86_64/kernel-5.10:kernel-5.10 \



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

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



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

PRODUCT_COPY_FILES += \

    kernel/prebuilts/5.4/x86_64/kernel-5.4-allsyms:kernel-5.4-allsyms \

    kernel/prebuilts/5.10/x86_64/kernel-5.10-allsyms:kernel-5.10-allsyms \



endif