StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.

Browse Source 
Don't have to re-specify exclusion list for the patch file construction.
This commit is contained in:
Sriram Raman
2009-07-24 13:52:32 -07:00
parent 66ae61670d
commit 1e96ac8430
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/Makefile
View File

@@ -646,8 +646,7 @@ endif
# as the source (since they are very similar). Generate the patch so # as the source (since they are very similar). Generate the patch so
# we can see how big it's going to be, and include that in the system # we can see how big it's going to be, and include that in the system
# image size check calculation. # image size check calculation.
ifneq ($(TARGET_PRODUCT),sdk) ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)
ifneq ($(TARGET_PRODUCT),generic)
intermediates := $(call intermediates-dir-for,PACKAGING,recovery_patch) intermediates := $(call intermediates-dir-for,PACKAGING,recovery_patch)
RECOVERY_FROM_BOOT_PATCH := $(intermediates)/recovery_from_boot.p RECOVERY_FROM_BOOT_PATCH := $(intermediates)/recovery_from_boot.p
$(RECOVERY_FROM_BOOT_PATCH): $(INSTALLED_RECOVERYIMAGE_TARGET) \ $(RECOVERY_FROM_BOOT_PATCH): $(INSTALLED_RECOVERYIMAGE_TARGET) \
@@ -657,8 +656,8 @@ $(RECOVERY_FROM_BOOT_PATCH): $(INSTALLED_RECOVERYIMAGE_TARGET) \
@echo "Construct recovery from boot" @echo "Construct recovery from boot"
mkdir -p $(dir $@) mkdir -p $(dir $@)
PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(HOST_OUT_EXECUTABLES)/imgdiff $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_RECOVERYIMAGE_TARGET) $@ PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(HOST_OUT_EXECUTABLES)/imgdiff $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_RECOVERYIMAGE_TARGET) $@
endif # TARGET_PRODUCT != generic endif
endif # TARGET_PRODUCT != sdk
$(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH) | $(ACP) $(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH) | $(ACP)
@echo "Install system fs image: $@" @echo "Install system fs image: $@"