tree f6121362d8836f34d5e05aca8f7bd9d89d278365
parent 4011bb161a60fb04fb0d4c4c3e1090d43fcdd9e4
author Tao Bao <tbao@google.com> 1478198235 -0700
committer Tao Bao <tbao@google.com> 1478199466 -0700

Revert "Revert "Some cleanups to recovery.""

This reverts commit 8584fcf677dd45b30121bd0490b06297e6be1871.

This CL re-lands commit c0319b60f56d445c2d1c74f551e01f069b028fe6.
The "stage" and "reason" variables are now declared as global by
dropping the static qualifier, because they may be used by vendor
recovery libraries.

Test: lunch aosp_angler-userdebug; mmma bootable/recovery
Test: lunch aosp_dragon-userdebug; mmma bootable/recovery

Change-Id: I252c346f450079478cff22bbff01590b8ab2e2b3