Track the name change for wipe_ab.

Bug: 27253717
Change-Id: I0d4c91e99267afdc4846ea50e602a2383898b9b4
This commit is contained in:
Tao Bao 2016-06-10 10:11:54 -07:00
parent 323f0f9407
commit c3c17534da
1 changed files with 5 additions and 5 deletions

View File

@ -883,10 +883,10 @@ recovery_fstab := $(TARGET_RECOVERY_FSTAB)
else
recovery_fstab := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery.fstab))
endif
ifdef TARGET_RECOVERY_BRICK
recovery_brick := $(TARGET_RECOVERY_BRICK)
ifdef TARGET_RECOVERY_WIPE
recovery_wipe := $(TARGET_RECOVERY_WIPE)
else
recovery_brick :=
recovery_wipe :=
endif
# Prior to A/B update, we used to have:
@ -973,8 +973,8 @@ define build-recoveryimage-target
cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/$(newline))
$(hide) $(foreach item,$(recovery_fstab), \
cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.fstab)
$(if $(strip $(recovery_brick)), \
$(hide) cp -f $(recovery_brick) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.brick)
$(if $(strip $(recovery_wipe)), \
$(hide) cp -f $(recovery_wipe) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.wipe)
$(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