From ac9d94d19c5f0e8c769d2368790df679c665ea34 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Thu, 3 Nov 2016 11:37:15 -0700
Subject: 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
---
 verifier.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'verifier.cpp')

diff --git a/verifier.cpp b/verifier.cpp
index 82cdd3bc7..44098f70e 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
+#include "verifier.h"
+
 #include <errno.h>
-#include <malloc.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <algorithm>
@@ -31,9 +33,6 @@
 #include "common.h"
 #include "print_sha1.h"
 #include "ui.h"
-#include "verifier.h"
-
-extern RecoveryUI* ui;
 
 static constexpr size_t MiB = 1024 * 1024;
 
-- 
cgit v1.2.3