diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-17 10:18:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-17 10:18:43 +0000 |
| commit | e77729e02b31256b997e0229222dfb8fecc46084 (patch) | |
| tree | df10178f537833442d88e1dfa5f8c5818f3bab38 | |
| parent | 6e2acf1c60d32ea50203db35d145ada69404e916 (diff) | |
| parent | 870752dfd2e71c6477d010eb6df28e2d72473783 (diff) | |
| download | build-e77729e02b31256b997e0229222dfb8fecc46084.tar.gz | |
Merge "Remove mainline boot.img from GSI targets" into sc-dev
| -rw-r--r-- | target/board/generic_arm64/BoardConfig.mk | 4 | ||||
| -rw-r--r-- | target/board/generic_arm64/device.mk | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 21b4065487..d10580edfb 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -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 += \ diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index 27dc158fbd..39dc7ba378 100644 --- a/target/board/generic_arm64/device.mk +++ b/target/board/generic_arm64/device.mk @@ -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 += \ |