From c0319b60f56d445c2d1c74f551e01f069b028fe6 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 13 Oct 2016 15:17:04 -0700 Subject: Some cleanups to recovery. - Remove the duplicate gCurrentUI variable in recovery.cpp; - Refactor the load/save of locale functions; - Clean up ui_print() to get rid of 256-byte buffer limit; - Declare ui in common.h; - Move the typedef of Volume into roots.h. Test: Build and boot into recovery image. Change-Id: Ia28c116858ca754133127a5ff9c722af67ad55b7 --- print_sha1.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'print_sha1.h') diff --git a/print_sha1.h b/print_sha1.h index c7c1f3651..1f8589519 100644 --- a/print_sha1.h +++ b/print_sha1.h @@ -20,7 +20,7 @@ #include #include -#include "openssl/sha.h" +#include static std::string print_sha1(const uint8_t* sha1, size_t len) { const char* hex = "0123456789abcdef"; @@ -41,7 +41,7 @@ static std::string short_sha1(const uint8_t sha1[SHA_DIGEST_LENGTH]) { } static std::string print_hex(const uint8_t* bytes, size_t len) { - return print_sha1(bytes, len); + return print_sha1(bytes, len); } #endif // RECOVERY_PRINT_SHA1_H -- cgit v1.2.3 From 8584fcf677dd45b30121bd0490b06297e6be1871 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 27 Oct 2016 03:08:08 +0000 Subject: Revert "Some cleanups to recovery." This reverts commit c0319b60f56d445c2d1c74f551e01f069b028fe6. Reason for revert: Broke builds. Change-Id: I82aa880b83de5ae6c36fd7567cb001920559a972 --- print_sha1.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'print_sha1.h') diff --git a/print_sha1.h b/print_sha1.h index 1f8589519..c7c1f3651 100644 --- a/print_sha1.h +++ b/print_sha1.h @@ -20,7 +20,7 @@ #include #include -#include +#include "openssl/sha.h" static std::string print_sha1(const uint8_t* sha1, size_t len) { const char* hex = "0123456789abcdef"; @@ -41,7 +41,7 @@ static std::string short_sha1(const uint8_t sha1[SHA_DIGEST_LENGTH]) { } static std::string print_hex(const uint8_t* bytes, size_t len) { - return print_sha1(bytes, len); + return print_sha1(bytes, len); } #endif // RECOVERY_PRINT_SHA1_H -- cgit v1.2.3 From ac9d94d19c5f0e8c769d2368790df679c665ea34 Mon Sep 17 00:00:00 2001 From: Tao Bao 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 --- print_sha1.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'print_sha1.h') diff --git a/print_sha1.h b/print_sha1.h index c7c1f3651..1f8589519 100644 --- a/print_sha1.h +++ b/print_sha1.h @@ -20,7 +20,7 @@ #include #include -#include "openssl/sha.h" +#include static std::string print_sha1(const uint8_t* sha1, size_t len) { const char* hex = "0123456789abcdef"; @@ -41,7 +41,7 @@ static std::string short_sha1(const uint8_t sha1[SHA_DIGEST_LENGTH]) { } static std::string print_hex(const uint8_t* bytes, size_t len) { - return print_sha1(bytes, len); + return print_sha1(bytes, len); } #endif // RECOVERY_PRINT_SHA1_H -- cgit v1.2.3