Revert "Revert "Some cleanups to recovery.""

This reverts commit 8584fcf677.

This CL re-lands commit c0319b60f5.
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
This commit is contained in:
Tao Bao
2016-11-03 11:57:46 -07:00
parent 4011bb161a
commit ac9d94d19c
7 changed files with 70 additions and 71 deletions
-2
View File
@@ -43,8 +43,6 @@
#include "ui.h"
#include "verifier.h"
extern RecoveryUI* ui;
#define ASSUMED_UPDATE_BINARY_NAME "META-INF/com/google/android/update-binary"
#define PUBLIC_KEYS_FILE "/res/keys"
static constexpr const char* METADATA_PATH = "META-INF/com/android/metadata";