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

Commit 43f2eb28 authored by Colin Cross's avatar Colin Cross
Browse files

Make dependencies of target-files.zip conditional 

Depend on the files going into the images instead of the images
themselves when the images are not prebuilts.  This will allow
paralellizing image generation with target-files.zip.

Test: treehugger
Test: m installclean && m target-files-package has same files before and after
Change-Id: If51d0f53602c08bd946ec34a2edae6f9d95f7bf8
parent 8d900929

core/Makefile

+74 −14
Original line number Diff line number Diff line
@@ -4267,6 +4267,77 @@ ifdef BUILDING_SYSTEM_IMAGE 
  $(BUILT_TARGET_FILES_PACKAGE): $(FULL_SYSTEMIMAGE_DEPS)

endif



ifdef BUILDING_USERDATA_IMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_USERDATAIMAGE_FILES)

endif



ifdef BUILDING_SYSTEM_OTHER_IMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_SYSTEMOTHERIMAGE_FILES)

endif



ifdef BUILDING_VENDOR_BOOT_IMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_VENDOR_RAMDISK_FILES)

endif



ifdef BUILDING_RECOVERY_IMAGE

  # TODO(b/30414428): Can't depend on INTERNAL_RECOVERYIMAGE_FILES alone like other

  # BUILD_TARGET_FILES_PACKAGE dependencies because currently there're cp/rsync/rm

  # commands in build-recoveryimage-target, which would touch the files under

  # TARGET_RECOVERY_OUT and race with packaging target-files.zip.

  ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

    $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_BOOTIMAGE_TARGET)

  else

    $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_RECOVERYIMAGE_TARGET)

  endif

  $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_RECOVERYIMAGE_FILES)

endif



# Conditionally depend on the image files if the image is being built so the

# target-files.zip rule doesn't wait on the image creation rule, or the image

# if it is coming from a prebuilt.



ifdef BUILDING_VENDOR_IMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_VENDORIMAGE_FILES)

else ifdef BOARD_PREBUILT_VENDORIMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_VENDORIMAGE_TARGET)

endif



ifdef BUILDING_PRODUCT_IMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_PRODUCTIMAGE_FILES)

else ifdef BOARD_PREBUILT_PRODUCTIMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_PRODUCTIMAGE_TARGET)

endif



ifdef BUILDING_SYSTEM_EXT_IMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_SYSTEM_EXTIMAGE_FILES)

else ifdef BOARD_PREBUILT_SYSTEM_EXTIMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_SYSTEM_EXTIMAGE_TARGET)

endif



ifdef BUILDING_BOOT_IMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_RAMDISK_FILES)

else ifdef BOARD_PREBUILT_BOOTIMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_BOOTIMAGE_TARGET)

endif



ifdef BUILDING_ODM_IMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_ODMIMAGE_FILES)

else ifdef BOARD_PREBUILT_ODMIMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_ODMIMAGE_TARGET)

endif



ifdef BUILDING_VENDOR_DLKM_IMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_VENDOR_DLKMIMAGE_FILES)

else ifdef BOARD_PREBUILT_VENDOR_DLKIMMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_VENDOR_DLKMIMAGE_TARGET)

endif



ifdef BUILDING_ODM_DLKM_IMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_ODM_DLKMIMAGE_FILES)

else ifdef BOARD_ODM_VENDOR_DLKIMMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_ODM_DLKMIMAGE_TARGET)

endif



ifeq ($(BUILD_QEMU_IMAGES),true)

  MK_VBMETA_BOOT_KERNEL_CMDLINE_SH := device/generic/goldfish/tools/mk_vbmeta_boot_params.sh

  $(BUILT_TARGET_FILES_PACKAGE): $(MK_VBMETA_BOOT_KERNEL_CMDLINE_SH)
@@ -4280,22 +4351,11 @@ endif 
# Depending on the various images guarantees that the underlying

# directories are up-to-date.

$(BUILT_TARGET_FILES_PACKAGE): \

	    $(INSTALLED_RAMDISK_TARGET) \

	    $(INSTALLED_BOOTIMAGE_TARGET) \

	    $(INSTALLED_VENDOR_BOOTIMAGE_TARGET) \

	    $(INSTALLED_RADIOIMAGE_TARGET) \

	    $(INSTALLED_RECOVERYIMAGE_TARGET) \

	    $(INSTALLED_USERDATAIMAGE_TARGET) \

	    $(INSTALLED_CACHEIMAGE_TARGET) \

	    $(INSTALLED_VENDORIMAGE_TARGET) \

	    $(INSTALLED_PRODUCTIMAGE_TARGET) \

	    $(INSTALLED_SYSTEM_EXTIMAGE_TARGET) \

	    $(INSTALLED_ODMIMAGE_TARGET) \

	    $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \

	    $(INSTALLED_ODM_DLKMIMAGE_TARGET) \

	    $(INSTALLED_DTBOIMAGE_TARGET) \

	    $(INSTALLED_CUSTOMIMAGES_TARGET) \

	    $(INTERNAL_SYSTEMOTHERIMAGE_FILES) \

	    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \

	    $(INSTALLED_KERNEL_TARGET) \

	    $(INSTALLED_DTBIMAGE_TARGET) \