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

Commit 1a73e987 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" am: 95654c51 am: fa33ae6f 

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



Change-Id: If7455d464bdbaeb8917704678e7d23c7a9ca7583
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d288f34 fa33ae6f

core/Makefile

+10 −5
Original line number Diff line number Diff line
@@ -976,6 +976,8 @@ INTERNAL_BOOTIMAGE_ARGS := \ 


INTERNAL_INIT_BOOT_IMAGE_ARGS :=



# TODO(b/229701033): clean up BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK.

ifneq ($(BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK),true)

  ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

    ifneq ($(BUILDING_INIT_BOOT_IMAGE),true)

      INTERNAL_BOOTIMAGE_ARGS += --ramdisk $(INSTALLED_RAMDISK_TARGET)
@@ -983,6 +985,7 @@ ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) 
      INTERNAL_INIT_BOOT_IMAGE_ARGS += --ramdisk $(INSTALLED_RAMDISK_TARGET)

    endif

  endif

endif



ifndef BUILDING_VENDOR_BOOT_IMAGE

ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG
@@ -2009,6 +2012,8 @@ $(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),\ 
    $(hide) echo "recovery_as_boot=true" >> $(1))

$(if $(filter true,$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)),\

    $(hide) echo "system_root_image=true" >> $(1))

$(if $(filter true,$(BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK)),\

    $(hide) echo "gki_boot_image_without_ramdisk=true" >> $(1))

$(hide) echo "root_dir=$(TARGET_ROOT_OUT)" >> $(1)

$(if $(filter true,$(PRODUCT_USE_DYNAMIC_PARTITION_SIZE)),\

    $(hide) echo "use_dynamic_partition_size=true" >> $(1))

tools/releasetools/common.py

+3 −0
Original line number Diff line number Diff line
@@ -1782,6 +1782,9 @@ def HasRamdisk(partition_name, info_dict=None): 
  if info_dict.get("recovery_as_boot") == "true":

    return True  # the recovery-as-boot boot.img has a RECOVERY ramdisk.



  if info_dict.get("gki_boot_image_without_ramdisk") == "true":

    return False  # A GKI boot.img has no ramdisk since Android-13.



  if info_dict.get("system_root_image") == "true":

    # The ramdisk content is merged into the system.img, so there is NO

    # ramdisk in the boot.img or boot-<kernel version>.img.