release-request-fbba21d1-17b5-4752-9864-95770e5db190-for-git_oc-mr1-release-4144771 snap-temp-L10300000078657232

Change-Id: If037aa310a32dd1e7a448387a20d1e83ee3e960e

Android.mk

@@ -59,7 +59,8 @@ LOCAL_STATIC_LIBRARIES := \
     libvintf_recovery \
     libcrypto_utils \
     libcrypto \
-    libbase
+    libbase \
+    libziparchive \
 
 include $(BUILD_STATIC_LIBRARY)
 

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);

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