From bc8cf8f8d5fd63620c4ec410071a7c50f799a3da Mon Sep 17 00:00:00 2001 From: sgnanase Date: Thu, 26 Oct 2023 19:15:31 +0530 Subject: [PATCH] Improve compilation speed for android build Rename ISO_INSTALL_IMG_ZIP to ISO_INSTALL_IMG_TAR Tracked-On: OAM-112083 Signed-off-by: sgnanase --- tasks/flashfiles.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tasks/flashfiles.mk b/tasks/flashfiles.mk index ece626e..70ec38e 100755 --- a/tasks/flashfiles.mk +++ b/tasks/flashfiles.mk @@ -303,7 +303,7 @@ ISO_INSTALL_IMG = $(PRODUCT_OUT)/$(TARGET_PRODUCT)-sign-flashfile-$(FILE_NAME_TA else ISO_INSTALL_IMG = $(PRODUCT_OUT)/$(TARGET_PRODUCT)-flashfile-$(FILE_NAME_TAG).iso endif -ISO_INSTALL_IMG_ZIP = $(ISO_INSTALL_IMG).tar.gz +ISO_INSTALL_IMG_TAR = $(ISO_INSTALL_IMG).tar.gz ISO_RELEASE_TAR = $(PRODUCT_OUT)/$(TARGET_PRODUCT)-releasefile-$(TARGET_BUILD_VARIANT).iso.tar.gz ISO_EFI = $(PRODUCT_OUT)/iso_tmp.efi @@ -419,7 +419,7 @@ endif ifneq ($(iso_image),false) @echo "Generating ISO image $(ISO_INSTALL_IMG) ..."; $(hide)rm -rf $(PRODUCT_OUT)/efi_images_tmp/; - $(hide)rm -rf $(ISO_INSTALL_IMG) $(ISO_INSTALL_IMG_ZIP) + $(hide)rm -rf $(ISO_INSTALL_IMG) $(ISO_INSTALL_IMG_TAR) $(hide)mkdir -p $(PRODUCT_OUT)/efi_images_tmp; ifeq ($(LEGACY_FLASHZIP_TRUE),true) @@ -459,8 +459,8 @@ endif $(hide)xorriso -as mkisofs -iso-level 3 -r -V "Civ ISO" -J -joliet-long -append_partition 2 0xef $(ISO_EFI) \ -partition_cyl_align all -o $(ISO_INSTALL_IMG) $(PRODUCT_OUT)/iso/ - @echo "Tar ISO image $(ISO_INSTALL_IMG_ZIP) ..." - $(hide) tar -cvf - $(ISO_INSTALL_IMG) | /usr/bin/pigz > $(ISO_INSTALL_IMG_ZIP) + @echo "Tar ISO image $(ISO_INSTALL_IMG_TAR) ..." + $(hide) tar -cvf - $(ISO_INSTALL_IMG) | /usr/bin/pigz > $(ISO_INSTALL_IMG_TAR) ifeq (,$(filter apollo_ivi blizzard_ivi celadon_ivi,$(TARGET_PRODUCT))) @echo "Zipping ISO release image $(ISO_RELEASE_TAR) ..." $(hide)rm -rf $(ISO_RELEASE_TAR) @@ -480,7 +480,7 @@ endif ifeq (,$(filter apollo_ivi blizzard_ivi celadon_ivi,$(TARGET_PRODUCT))) $(hide) cp -r $(ISO_RELEASE_TAR) $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT) endif - $(hide) cp -r $(ISO_INSTALL_IMG_ZIP) $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT) + $(hide) cp -r $(ISO_INSTALL_IMG_TAR) $(TOP)/pub/$(TARGET_PRODUCT)/$(TARGET_BUILD_VARIANT) $(hide)rm -rf $(PRODUCT_OUT)/efi_images_tmp/ $(PRODUCT_OUT)/iso $(ISO_EFI)