From 62dd5baa002df9fcc9da29b259d1e7f92f9b10f7 Mon Sep 17 00:00:00 2001 From: Chippa-a Date: Wed, 13 Sep 2023 19:33:35 +0300 Subject: [PATCH] lineage: Use 'intermediates-dir-for' for bootanimation src Place bootanimation source files in a dedicated intermediate dir to prevent the presence of a zero-byte archive in the target zip file. Change-Id: Iefd54bbcadd17985eb15e253aa4c74fbb7940b0d Signed-off-by: Chippa-a --- bootanimation/Android.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootanimation/Android.mk b/bootanimation/Android.mk index df4d9ad0..f58a850f 100644 --- a/bootanimation/Android.mk +++ b/bootanimation/Android.mk @@ -16,11 +16,11 @@ # TARGET_GENERATED_BOOTANIMATION := $(TARGET_OUT_INTERMEDIATES)/BOOTANIMATION/bootanimation.zip -$(TARGET_GENERATED_BOOTANIMATION): INTERMEDIATES := $(TARGET_OUT_INTERMEDIATES)/BOOTANIMATION +$(TARGET_GENERATED_BOOTANIMATION): INTERMEDIATES := $(call intermediates-dir-for,BOOTANIMATION,bootanimation) $(TARGET_GENERATED_BOOTANIMATION): $(SOONG_ZIP) @echo "Building bootanimation.zip" @rm -rf $(dir $@) - @mkdir -p $(dir $@) + @mkdir -p $(INTERMEDIATES) $(hide) tar xfp vendor/lineage/bootanimation/bootanimation.tar -C $(INTERMEDIATES) $(hide) if [ $(TARGET_SCREEN_HEIGHT) -lt $(TARGET_SCREEN_WIDTH) ]; then \ IMAGEWIDTH=$(TARGET_SCREEN_HEIGHT); \ @@ -40,7 +40,7 @@ $(TARGET_GENERATED_BOOTANIMATION): $(SOONG_ZIP) prebuilts/tools-lineage/${HOST_OS}-x86/bin/mogrify -resize $$RESOLUTION -colors 250 $(INTERMEDIATES)/*/*.png; \ echo "$$IMAGESCALEWIDTH $$IMAGESCALEHEIGHT 60" > $(INTERMEDIATES)/desc.txt; \ cat vendor/lineage/bootanimation/desc.txt >> $(INTERMEDIATES)/desc.txt - $(hide) $(SOONG_ZIP) -L 0 -o $(TARGET_GENERATED_BOOTANIMATION) -C $(INTERMEDIATES) -D $(INTERMEDIATES) + $(hide) $(SOONG_ZIP) -L 0 -o $@ -C $(INTERMEDIATES) -D $(INTERMEDIATES) ifeq ($(TARGET_BOOTANIMATION),) TARGET_BOOTANIMATION := $(TARGET_GENERATED_BOOTANIMATION)