From e1bb7a5752163a668fb764b2bf1d0d0cdf2bd43d Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 28 Jun 2017 08:00:17 -0700 Subject: Add missing libziparchive dependency. Bug: http://b/37560614 Test: builds even after removing system/core/include/ziparchive Change-Id: Ib7ed45cafe83d24ed55aac28b4f41a073c371bc2 --- Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index 5348e365e..84f675ba4 100644 --- a/Android.mk +++ b/Android.mk @@ -59,7 +59,8 @@ LOCAL_STATIC_LIBRARIES := \ libvintf_recovery \ libcrypto_utils \ libcrypto \ - libbase + libbase \ + libziparchive \ include $(BUILD_STATIC_LIBRARY) -- cgit v1.2.3 From 0bc54dd83fee524e4475770df16570923aea13cb Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 28 Jun 2017 15:27:34 -0700 Subject: wear_ui: Remove dead/duplicate codes. WearRecoveryUI::draw_progress_locked() has declaration only, where the definition was deleted in commit 5e7cfb9af64d5f6bf616d9b6fa40bd0ae82e781a. WearRecoveryUI::ClearText() is a duplicates of ScreenRecoveryUI::ClearText(). Test: Build swordfish recovery image. 'Run graphics test' and 'View recovery logs'. Change-Id: Ib66955d1d496f04359b4d6487160218e8f954478 --- wear_ui.cpp | 11 ----------- wear_ui.h | 2 -- 2 files changed, 13 deletions(-) diff --git a/wear_ui.cpp b/wear_ui.cpp index 640f04a79..a29746cdc 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -363,17 +363,6 @@ void WearRecoveryUI::ShowFile(const char* filename) { fclose(fp); } -void WearRecoveryUI::ClearText() { - pthread_mutex_lock(&updateMutex); - text_col_ = 0; - text_row_ = 0; - text_top_ = 1; - for (size_t i = 0; i < text_rows_; ++i) { - memset(text_[i], 0, text_cols_ + 1); - } - pthread_mutex_unlock(&updateMutex); -} - void WearRecoveryUI::PrintOnScreenOnly(const char *fmt, ...) { va_list ap; va_start(ap, fmt); diff --git a/wear_ui.h b/wear_ui.h index e108d4d7e..a814118c7 100644 --- a/wear_ui.h +++ b/wear_ui.h @@ -75,10 +75,8 @@ class WearRecoveryUI : public ScreenRecoveryUI { void draw_background_locked() override; void draw_screen_locked() override; - void draw_progress_locked(); void PutChar(char); - void ClearText(); }; #endif // RECOVERY_WEAR_UI_H -- cgit v1.2.3