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

Merge commit '7a7cd0d8a3ee6d061d7b505583cb791eec6124f5'

Browse Source
This commit is contained in:
Android Git Automerger
2009-07-24 12:47:03 -07:00
parent 358a48e12a 7a7cd0d8a3
commit 72e108a1d4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/Makefile
View File

@@ -647,14 +647,19 @@ 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)
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) \
$(INSTALLED_BOOTIMAGE_TARGET) \ $(INSTALLED_BOOTIMAGE_TARGET) \
| $(HOST_OUT_EXECUTABLES)/imgdiff | $(HOST_OUT_EXECUTABLES)/imgdiff \
$(HOST_OUT_EXECUTABLES)/bsdiff
@echo "Construct recovery from boot" @echo "Construct recovery from boot"
mkdir -p $(dir $@) mkdir -p $(dir $@)
$(HOST_OUT_EXECUTABLES)/imgdiff $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_RECOVERYIMAGE_TARGET) $@ $(HOST_OUT_EXECUTABLES)/imgdiff $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_RECOVERYIMAGE_TARGET) $@
else # TARGET_PRODUCT == sdk
RECOVERY_FROM_BOOT_PATCH :=
endif
$(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: $@"