aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2016-11-03 13:37:15 -0500
committerTao Bao2016-11-03 13:57:46 -0500
commitac9d94d19c5f0e8c769d2368790df679c665ea34 (patch)
treef6121362d8836f34d5e05aca8f7bd9d89d278365 /install.cpp
parent4011bb161a60fb04fb0d4c4c3e1090d43fcdd9e4 (diff)
downloadplatform-bootable-recovery-ac9d94d19c5f0e8c769d2368790df679c665ea34.tar.gz
platform-bootable-recovery-ac9d94d19c5f0e8c769d2368790df679c665ea34.tar.xz
platform-bootable-recovery-ac9d94d19c5f0e8c769d2368790df679c665ea34.zip
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
Diffstat (limited to 'install.cpp')
-rw-r--r--install.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/install.cpp b/install.cpp
index 0f9088a7..3871271f 100644
--- a/install.cpp
+++ b/install.cpp
@@ -43,8 +43,6 @@
43#include "ui.h" 43#include "ui.h"
44#include "verifier.h" 44#include "verifier.h"
45 45
46extern RecoveryUI* ui;
47
48#define ASSUMED_UPDATE_BINARY_NAME "META-INF/com/google/android/update-binary" 46#define ASSUMED_UPDATE_BINARY_NAME "META-INF/com/google/android/update-binary"
49#define PUBLIC_KEYS_FILE "/res/keys" 47#define PUBLIC_KEYS_FILE "/res/keys"
50static constexpr const char* METADATA_PATH = "META-INF/com/android/metadata"; 48static constexpr const char* METADATA_PATH = "META-INF/com/android/metadata";