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

Commit 943f1986 authored by Tao Bao's avatar Tao Bao Committed by Android (Google) Code Review
Browse files

Merge "Track the name change for wipe_ab." into nyc-mr1-dev

parents 21c8d29e c3c17534

core/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -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