commit c3c17534daea58e4290a925d3b87ea3a45ef1402
author Tao Bao <tbao@google.com> Fri Jun 10 10:11:54 2016 -0700
committer Tao Bao <tbao@google.com> Fri Jun 10 10:14:14 2016 -0700
tree 82e0306656519d75d1fdec89a146c626e9845350
parent 323f0f940767c1d6c3d933fa30423c56cf546ce5

Track the name change for wipe_ab.

Bug: 27253717
Change-Id: I0d4c91e99267afdc4846ea50e602a2383898b9b4

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 32c1755..a1e7733 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -883,10 +883,10 @@
 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 @@
     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