Snap for 8558685 from 239b3e9cdaa980c64eb8698ea3821aa46985b2e3 to tm-frc-ipsec-releaset_frc_ips_330443010android13-frc-ipsec-release

Change-Id: Ie29942ecb9d874a639ebd9ff81b03f8195d11d1b

6 files changed, 55 insertions, 94 deletions

diff --git a/BoardConfigGkiCommon.mk b/BoardConfigGkiCommon.mk
index 662e0ec..c7970d7 100644
--- a/BoardConfigGkiCommon.mk
+++ b/BoardConfigGkiCommon.mk
@@ -34,19 +34,13 @@ BOARD_AVB_INIT_BOOT_ROLLBACK_INDEX_LOCATION := 3
 # Sets boot SPL.
 BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
 
-# Boot image with ramdisk and kernel
+# Boot image with kernel only (no ramdisk)
 BOARD_BOOT_HEADER_VERSION := 4
 BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
 BOARD_USES_RECOVERY_AS_BOOT :=
 TARGET_NO_KERNEL := false
 BOARD_USES_GENERIC_KERNEL_IMAGE := true
-
-# Init boot image
-BOARD_RAMDISK_USE_LZ4 := true
-BOARD_INIT_BOOT_HEADER_VERSION := 4
-BOARD_MKBOOTIMG_INIT_ARGS += --header_version $(BOARD_INIT_BOOT_HEADER_VERSION)
-# TODO(b/212486689) Need to confirm the size
-BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE := 8388608
+BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK ?= true
 
 # No system image
 BOARD_SYSTEMIMAGE_PARTITION_SIZE :=
diff --git a/gki_arm64.mk b/gki_arm64.mk
index ede3001..3ff21cd 100644
--- a/gki_arm64.mk
+++ b/gki_arm64.mk
@@ -24,9 +24,39 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)
 # Build GKI boot images
 #
 include device/generic/common/gki_common.mk
-$(call output-kernel,kernel/prebuilts/4.19/arm64,kernel/4.19)
-$(call output-kernel,kernel/prebuilts/5.10/arm64,kernel/5.10)
-$(call output-kernel,kernel/prebuilts/5.15/arm64,kernel/5.15)
+
+PRODUCT_COPY_FILES += \
+    kernel/prebuilts/4.19/arm64/kernel-4.19:kernel-4.19 \
+    kernel/prebuilts/4.19/arm64/kernel-4.19-gz:kernel-4.19-gz \
+    kernel/prebuilts/4.19/arm64/kernel-4.19-lz4:kernel-4.19-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 \
+    kernel/prebuilts/5.15/arm64/kernel-5.15:kernel-5.15 \
+    kernel/prebuilts/5.15/arm64/kernel-5.15-gz:kernel-5.15-gz \
+    kernel/prebuilts/5.15/arm64/kernel-5.15-lz4:kernel-5.15-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.10/arm64/prebuilt-info.txt:kernel/5.10/prebuilt-info.txt)
+$(call dist-for-goals,dist_files,kernel/prebuilts/5.15/arm64/prebuilt-info.txt:kernel/5.15/prebuilt-info.txt)
+
+ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+PRODUCT_COPY_FILES += \
+    kernel/prebuilts/4.19/arm64/kernel-4.19-allsyms:kernel-4.19-allsyms \
+    kernel/prebuilts/4.19/arm64/kernel-4.19-gz-allsyms:kernel-4.19-gz-allsyms \
+    kernel/prebuilts/4.19/arm64/kernel-4.19-lz4-allsyms:kernel-4.19-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 \
+    kernel/prebuilts/5.15/arm64/kernel-5.15-allsyms:kernel-5.15-allsyms \
+    kernel/prebuilts/5.15/arm64/kernel-5.15-gz-allsyms:kernel-5.15-gz-allsyms \
+    kernel/prebuilts/5.15/arm64/kernel-5.15-lz4-allsyms:kernel-5.15-lz4-allsyms \
+
+$(call dist-for-goals,dist_files,kernel/prebuilts/4.19/arm64/prebuilt-info.txt:kernel/4.19-debug/prebuilt-info.txt)
+$(call dist-for-goals,dist_files,kernel/prebuilts/5.10/arm64/prebuilt-info.txt:kernel/5.10-debug/prebuilt-info.txt)
+$(call dist-for-goals,dist_files,kernel/prebuilts/5.15/arm64/prebuilt-info.txt:kernel/5.15-debug/prebuilt-info.txt)
+
+endif
 
 
 PRODUCT_NAME := gki_arm64
diff --git a/gki_common.mk b/gki_common.mk
index b2b717d..42b9a6c 100644
--- a/gki_common.mk
+++ b/gki_common.mk
@@ -14,82 +14,13 @@
 # limitations under the License.
 #
 
-# The files will be copy from the source folder to the dist folder
-_output-kernel-info-files := \
-    prebuilt-info.txt \
-    manifest.xml \
-
-
-# Copy the files from the source folder to the dist folder
-#
-# Skip if the file is not existing.
-#
-# $(1): file list
-# $(2): the source folder
-# $(3): the dist folder
-define _output_kernel_files
-$(foreach f,$(1), \
-  $(if $(wildcard $(2)/$(f)), \
-    $(call dist-for-goals,dist_files,$(2)/$(f):$(3)/$(f))))
-endef
-
-
-# Output the release kernel prebuilt files to dist folder
-#
-# $(1): the source folder contains the kernel prebuilt files
-# $(2): the dist folder
-#
-# Notes:
-#   For mainline kernel, it outputs -allsyms kernel as release kernel.
-#
-define _output-kernel-user
-$(if $(findstring mainline,$(1)), \
-  $(eval PRODUCT_COPY_FILES += \
-    $(foreach f,$(wildcard $(1)/kernel-*-allsyms), \
-      $(f):$(subst -allsyms,,$(notdir $(f))))), \
-  $(eval PRODUCT_COPY_FILES += \
-    $(call copy-files,$(filter-out *-allsyms,$(wildcard $(1)/kernel-*)),.)))
-endef
-
-
-# Output the debug kernel prebuilt files to dist folder
-#
-# $(1): the source folder contains the kernel prebuilt files
-# $(2): the dist folder
-#
-# Note:
-#   For mainline kernel, it outputs -allsyms kernel as release kernel,
-#   so there is no need to output -allsyms again.
-#
-define _output-kernel-debug
-$(if $(findstring mainline,$(1)),, \
-  $(eval PRODUCT_COPY_FILES += \
-    $(call copy-files,$(wildcard $(1)/kernel-*-allsyms),.)))
-endef
-
-
-# Output the kernel prebuilt files to dist folder
-#
-# $(1): the source folder contains the kernel prebuilt files
-# $(2): the dist folder
-#
-# Example:
-#  $(call output-kernel,kernel/prebuilts/5.10/arm64,kernel/5.10)
-#
-define output-kernel
-$(call _output-kernel-user,$(1),$(2))
-$(if $(filter userdebug eng,$(TARGET_BUILD_VARIANT)), \
-  $(call _output-kernel-debug,$(1),$(2)))
-$(call _output_kernel_files,$(_output-kernel-info-files),$(1),$(2))
-endef
-
 #
-# Output boot.img and init-boot.img
+# Output boot.img
 #
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
 PRODUCT_BUILD_BOOT_IMAGE := true
-PRODUCT_BUILD_INIT_BOOT_IMAGE := true
 
+PRODUCT_BUILD_INIT_BOOT_IMAGE := false
 PRODUCT_BUILD_CACHE_IMAGE := false
 PRODUCT_BUILD_ODM_IMAGE := false
 PRODUCT_BUILD_VENDOR_DLKM_IMAGE := false
diff --git a/gki_x86_64.mk b/gki_x86_64.mk
index 75f5ff7..2dc7919 100644
--- a/gki_x86_64.mk
+++ b/gki_x86_64.mk
@@ -24,8 +24,24 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)
 # Build GKI boot images
 #
 include device/generic/common/gki_common.mk
-$(call output-kernel,kernel/prebuilts/5.10/x86_64,kernel/5.10)
-$(call output-kernel,kernel/prebuilts/5.15/x86_64,kernel/5.15)
+
+PRODUCT_COPY_FILES += \
+    kernel/prebuilts/5.10/x86_64/kernel-5.10:kernel-5.10 \
+    kernel/prebuilts/5.15/x86_64/kernel-5.15:kernel-5.15 \
+
+$(call dist-for-goals,dist_files,kernel/prebuilts/5.10/x86_64/prebuilt-info.txt:kernel/5.10/prebuilt-info.txt)
+$(call dist-for-goals,dist_files,kernel/prebuilts/5.15/x86_64/prebuilt-info.txt:kernel/5.15/prebuilt-info.txt)
+
+ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+
+PRODUCT_COPY_FILES += \
+    kernel/prebuilts/5.10/x86_64/kernel-5.10-allsyms:kernel-5.10-allsyms \
+    kernel/prebuilts/5.15/x86_64/kernel-5.15-allsyms:kernel-5.15-allsyms \
+
+$(call dist-for-goals,dist_files,kernel/prebuilts/5.10/x86_64/prebuilt-info.txt:kernel/5.10-debug/prebuilt-info.txt)
+$(call dist-for-goals,dist_files,kernel/prebuilts/5.15/x86_64/prebuilt-info.txt:kernel/5.15-debug/prebuilt-info.txt)
+
+endif
 
 
 PRODUCT_NAME := gki_x86_64
diff --git a/gsi_arm64.mk b/gsi_arm64.mk
index 53c8300..d792cd9 100644
--- a/gsi_arm64.mk
+++ b/gsi_arm64.mk
@@ -41,11 +41,6 @@ $(call inherit-product, device/generic/common/gsi_system_ext.mk)
 $(call inherit-product, device/generic/common/gsi_product.mk)
 
 #
-# All components inherited here go to boot image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
-
-#
 # Special settings for GSI releasing
 #
 $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
diff --git a/gsi_x86_64.mk b/gsi_x86_64.mk
index da7e093..eb5bd97 100644
--- a/gsi_x86_64.mk
+++ b/gsi_x86_64.mk
@@ -34,11 +34,6 @@ $(call inherit-product, device/generic/common/gsi_system_ext.mk)
 $(call inherit-product, device/generic/common/gsi_product.mk)
 
 #
-# All components inherited here go to boot image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
-
-#
 # Special settings to skip mount product and system_ext on the device,
 # so this product can be tested isolated from those partitions.
 #