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

Commit cda30c73 authored by Colin Cross's avatar Colin Cross
Browse files

Make dist zip files depend on files instead of images 

Depend on the files instead of images so that the dist zip files
can run in parallel with the image generation rules.

Test: treehugger
Change-Id: I1f942dc0ce0a2cbc5288c1f0633ea1019e77f91c
parent 43f2eb28

core/Makefile

+34 −38
Original line number Diff line number Diff line
@@ -4785,13 +4785,12 @@ endif # build_ota_package 
APPCOMPAT_ZIP := $(PRODUCT_OUT)/appcompat.zip

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(APPCOMPAT_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \

	    $(INSTALLED_RAMDISK_TARGET) \

	    $(INSTALLED_BOOTIMAGE_TARGET) \

	    $(INSTALLED_USERDATAIMAGE_TARGET) \

	    $(INSTALLED_VENDORIMAGE_TARGET) \

	    $(INSTALLED_PRODUCTIMAGE_TARGET) \

	    $(INSTALLED_SYSTEM_EXTIMAGE_TARGET)

$(APPCOMPAT_ZIP): $(FULL_SYSTEMIMAGE_DEPS) \

	    $(INTERNAL_RAMDISK_FILES) \

	    $(INTERNAL_USERDATAIMAGE_FILES) \

	    $(INTERNAL_VENDORIMAGE_FILES) \

	    $(INTERNAL_PRODUCTIMAGE_FILES) \

	    $(INTERNAL_SYSTEM_EXTIMAGE_FILES)

endif

$(APPCOMPAT_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,appcompat)/filelist

$(APPCOMPAT_ZIP): $(SOONG_ZIP)
@@ -4814,16 +4813,15 @@ name := $(name)-symbols-$(FILE_NAME_TAG) 
SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \

	    $(INSTALLED_RAMDISK_TARGET) \

	    $(INSTALLED_BOOTIMAGE_TARGET) \

	    $(INSTALLED_USERDATAIMAGE_TARGET) \

	    $(INSTALLED_VENDORIMAGE_TARGET) \

	    $(INSTALLED_PRODUCTIMAGE_TARGET) \

	    $(INSTALLED_SYSTEM_EXTIMAGE_TARGET) \

	    $(INSTALLED_ODMIMAGE_TARGET) \

	    $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \

	    $(INSTALLED_ODM_DLKMIMAGE_TARGET) \

$(SYMBOLS_ZIP): $(FULL_SYSTEMIMAGE_DEPS) \

	    $(INTERNAL_RAMDISK_FILES) \

	    $(INTERNAL_USERDATAIMAGE_FILES) \

	    $(INTERNAL_VENDORIMAGE_FILES) \

	    $(INTERNAL_PRODUCTIMAGE_FILES) \

	    $(INTERNAL_SYSTEM_EXTIMAGE_FILES) \

	    $(INTERNAL_ODMIMAGE_FILES) \

	    $(INTERNAL_VENDOR_DLKMIMAGE_FILES) \

	    $(INTERNAL_ODM_DLKMIMAGE_FILES) \

	    $(updater_dep)

endif

$(SYMBOLS_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,symbols)/filelist
@@ -4842,16 +4840,15 @@ name := $(name)_debug 
endif

COVERAGE_ZIP := $(PRODUCT_OUT)/$(name).zip

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(COVERAGE_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \

	    $(INSTALLED_RAMDISK_TARGET) \

	    $(INSTALLED_BOOTIMAGE_TARGET) \

	    $(INSTALLED_USERDATAIMAGE_TARGET) \

	    $(INSTALLED_VENDORIMAGE_TARGET) \

	    $(INSTALLED_PRODUCTIMAGE_TARGET) \

	    $(INSTALLED_SYSTEM_EXTIMAGE_TARGET) \

	    $(INSTALLED_ODMIMAGE_TARGET) \

	    $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \

	    $(INSTALLED_ODM_DLKMIMAGE_TARGET)

$(COVERAGE_ZIP): $(FULL_SYSTEMIMAGE_DEPS) \

	    $(INTERNAL_RAMDISK_FILES) \

	    $(INTERNAL_USERDATAIMAGE_FILES) \

	    $(INTERNAL_VENDORIMAGE_FILES) \

	    $(INTERNAL_PRODUCTIMAGE_FILES) \

	    $(INTERNAL_SYSTEM_EXTIMAGE_FILES) \

	    $(INTERNAL_ODMIMAGE_FILES) \

	    $(INTERNAL_VENDOR_DLKMIMAGE_FILES) \

	    $(INTERNAL_ODM_DLKMIMAGE_FILES)

endif

$(COVERAGE_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,coverage)/filelist

$(COVERAGE_ZIP): $(SOONG_ZIP)
@@ -4885,7 +4882,7 @@ endif 
name := $(name)-apps-$(FILE_NAME_TAG)



APPS_ZIP := $(PRODUCT_OUT)/$(name).zip

$(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET)

$(APPS_ZIP): $(FULL_SYSTEMIMAGE_DEPS)

	@echo "Package apps: $@"

	$(hide) rm -rf $@

	$(hide) mkdir -p $(dir $@)
@@ -4920,16 +4917,15 @@ PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_ 
# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(PROGUARD_DICT_ZIP): \

    $(INSTALLED_SYSTEMIMAGE_TARGET) \

    $(INSTALLED_RAMDISK_TARGET) \

    $(INSTALLED_BOOTIMAGE_TARGET) \

    $(INSTALLED_USERDATAIMAGE_TARGET) \

    $(INSTALLED_VENDORIMAGE_TARGET) \

    $(INSTALLED_PRODUCTIMAGE_TARGET) \

    $(INSTALLED_SYSTEM_EXTIMAGE_TARGET) \

    $(INSTALLED_ODMIMAGE_TARGET) \

    $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \

    $(INSTALLED_ODM_DLKMIMAGE_TARGET) \

    $(FULL_SYSTEMIMAGE_DEPS) \

    $(INTERNAL_RAMDISK_FILES) \

    $(INTERNAL_USERDATAIMAGE_FILES) \

    $(INTERNAL_VENDORIMAGE_FILES) \

    $(INTERNAL_PRODUCTIMAGE_FILES) \

    $(INTERNAL_SYSTEM_EXTIMAGE_FILES) \

    $(INTERNAL_ODMIMAGE_FILES) \

    $(INTERNAL_VENDOR_DLKMIMAGE_FILES) \

    $(INTERNAL_ODM_DLKMIMAGE_FILES) \

    $(updater_dep)

endif

$(PROGUARD_DICT_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,proguard)/filelist