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 /verifier.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 'verifier.cpp')
-rw-r--r--verifier.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/verifier.cpp b/verifier.cpp
index 82cdd3bc..44098f70 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -14,9 +14,11 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17#include "verifier.h"
18
17#include <errno.h> 19#include <errno.h>
18#include <malloc.h>
19#include <stdio.h> 20#include <stdio.h>
21#include <stdlib.h>
20#include <string.h> 22#include <string.h>
21 23
22#include <algorithm> 24#include <algorithm>
@@ -31,9 +33,6 @@
31#include "common.h" 33#include "common.h"
32#include "print_sha1.h" 34#include "print_sha1.h"
33#include "ui.h" 35#include "ui.h"
34#include "verifier.h"
35
36extern RecoveryUI* ui;
37 36
38static constexpr size_t MiB = 1024 * 1024; 37static constexpr size_t MiB = 1024 * 1024;
39 38