forked from openkylin/platform_build
am 10500d0e: resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aosp
* commit '10500d0ea7706a6a137e8afdd347d927f5512488': Add target recoveryimage-nodeps.
This commit is contained in:
Ying Wang
Android Git Automerger
commit
38a9d5a739
|
|
@ -830,6 +830,40 @@ $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys)
|
||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
java -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) > $@
|
java -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) > $@
|
||||||
|
|
||||||
|
# $(1): output file
|
||||||
|
define build-recoveryimage-target
|
||||||
|
@echo ----- Making recovery image ------
|
||||||
|
$(hide) rm -rf $(TARGET_RECOVERY_OUT)
|
||||||
|
$(hide) mkdir -p $(TARGET_RECOVERY_OUT)
|
||||||
|
$(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/tmp
|
||||||
|
@echo Copying baseline ramdisk...
|
||||||
|
$(hide) cp -R $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT)
|
||||||
|
@echo Modifying ramdisk contents...
|
||||||
|
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc
|
||||||
|
$(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/
|
||||||
|
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/sepolicy
|
||||||
|
$(hide) cp -f $(recovery_sepolicy) $(TARGET_RECOVERY_ROOT_OUT)/sepolicy
|
||||||
|
$(hide) -cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/
|
||||||
|
$(hide) cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/
|
||||||
|
$(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res
|
||||||
|
$(hide) rm -rf $(TARGET_RECOVERY_ROOT_OUT)/res/*
|
||||||
|
$(hide) cp -rf $(recovery_resources_common)/* $(TARGET_RECOVERY_ROOT_OUT)/res
|
||||||
|
$(hide) cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png
|
||||||
|
$(hide) $(foreach item,$(recovery_resources_private), \
|
||||||
|
cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/)
|
||||||
|
$(hide) $(foreach item,$(recovery_fstab), \
|
||||||
|
cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.fstab)
|
||||||
|
$(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys
|
||||||
|
$(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \
|
||||||
|
> $(TARGET_RECOVERY_ROOT_OUT)/default.prop
|
||||||
|
$(hide) $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) | $(MINIGZIP) > $(recovery_ramdisk)
|
||||||
|
$(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1)
|
||||||
|
$(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)),\
|
||||||
|
$(BOOT_SIGNER) /recovery $(1) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $(1))
|
||||||
|
$(hide) $(call assert-max-image-size,$(1),$(BOARD_RECOVERYIMAGE_PARTITION_SIZE))
|
||||||
|
@echo ----- Made recovery image: $(1) --------
|
||||||
|
endef
|
||||||
|
|
||||||
$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
|
$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
|
||||||
$(INSTALLED_RAMDISK_TARGET) \
|
$(INSTALLED_RAMDISK_TARGET) \
|
||||||
$(INSTALLED_BOOTIMAGE_TARGET) \
|
$(INSTALLED_BOOTIMAGE_TARGET) \
|
||||||
|
|
@ -839,42 +873,17 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
|
||||||
$(recovery_build_prop) $(recovery_resource_deps) \
|
$(recovery_build_prop) $(recovery_resource_deps) \
|
||||||
$(recovery_fstab) \
|
$(recovery_fstab) \
|
||||||
$(RECOVERY_INSTALL_OTA_KEYS)
|
$(RECOVERY_INSTALL_OTA_KEYS)
|
||||||
@echo ----- Making recovery image ------
|
$(call build-recoveryimage-target, $@)
|
||||||
$(hide) rm -rf $(TARGET_RECOVERY_OUT)
|
|
||||||
$(hide) mkdir -p $(TARGET_RECOVERY_OUT)
|
|
||||||
$(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/tmp
|
|
||||||
@echo Copying baseline ramdisk...
|
|
||||||
$(hide) cp -R $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT)
|
|
||||||
@echo Modifying ramdisk contents...
|
|
||||||
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc
|
|
||||||
$(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/
|
|
||||||
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/sepolicy
|
|
||||||
$(hide) cp -f $(recovery_sepolicy) $(TARGET_RECOVERY_ROOT_OUT)/sepolicy
|
|
||||||
$(hide) -cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/
|
|
||||||
$(hide) cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/
|
|
||||||
$(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res
|
|
||||||
$(hide) rm -rf $(TARGET_RECOVERY_ROOT_OUT)/res/*
|
|
||||||
$(hide) cp -rf $(recovery_resources_common)/* $(TARGET_RECOVERY_ROOT_OUT)/res
|
|
||||||
$(hide) cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png
|
|
||||||
$(hide) $(foreach item,$(recovery_resources_private), \
|
|
||||||
cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/)
|
|
||||||
$(hide) $(foreach item,$(recovery_fstab), \
|
|
||||||
cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.fstab)
|
|
||||||
$(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys
|
|
||||||
$(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \
|
|
||||||
> $(TARGET_RECOVERY_ROOT_OUT)/default.prop
|
|
||||||
$(hide) $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) | $(MINIGZIP) > $(recovery_ramdisk)
|
|
||||||
$(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@
|
|
||||||
ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY))
|
|
||||||
$(BOOT_SIGNER) /recovery $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $@
|
|
||||||
endif
|
|
||||||
$(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE))
|
|
||||||
@echo ----- Made recovery image: $@ --------
|
|
||||||
|
|
||||||
$(RECOVERY_RESOURCE_ZIP): $(INSTALLED_RECOVERYIMAGE_TARGET)
|
$(RECOVERY_RESOURCE_ZIP): $(INSTALLED_RECOVERYIMAGE_TARGET)
|
||||||
$(hide) mkdir -p $(dir $@)
|
$(hide) mkdir -p $(dir $@)
|
||||||
$(hide) find $(TARGET_RECOVERY_ROOT_OUT)/res -type f | sort | zip -0qrj $@ -@
|
$(hide) find $(TARGET_RECOVERY_ROOT_OUT)/res -type f | sort | zip -0qrj $@ -@
|
||||||
|
|
||||||
|
.PHONY: recoveryimage-nodeps
|
||||||
|
recoveryimage-nodeps:
|
||||||
|
@echo "make $@: ignoring dependencies"
|
||||||
|
$(call build-recoveryimage-target, $(INSTALLED_RECOVERYIMAGE_TARGET))
|
||||||
|
|
||||||
else
|
else
|
||||||
INSTALLED_RECOVERYIMAGE_TARGET :=
|
INSTALLED_RECOVERYIMAGE_TARGET :=
|
||||||
RECOVERY_RESOURCE_ZIP :=
|
RECOVERY_RESOURCE_ZIP :=
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,8 @@ dont_bother_goals := clean clobber dataclean installclean \
|
||||||
cacheimage-nodeps \
|
cacheimage-nodeps \
|
||||||
vendorimage-nodeps \
|
vendorimage-nodeps \
|
||||||
ramdisk-nodeps \
|
ramdisk-nodeps \
|
||||||
bootimage-nodeps
|
bootimage-nodeps \
|
||||||
|
recoveryimage-nodeps
|
||||||
|
|
||||||
ifneq ($(filter $(dont_bother_goals), $(MAKECMDGOALS)),)
|
ifneq ($(filter $(dont_bother_goals), $(MAKECMDGOALS)),)
|
||||||
dont_bother := true
|
dont_bother := true
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue