From d7bf82eb5358df367daaac12562fe5aa4e87ba63 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Sat, 18 Mar 2017 09:24:11 -0700
Subject: Remove the dead #include's in verifier.cpp.

A follow-up to commit 5e535014dd7961fbf812abeaa27f3339775031f1.
Also clean up Android.mk, since libverifier no longer needs anything
from libminui.

Test: mmma bootable/recovery
Test: recovery_component_test passes.
Change-Id: I1c11e4bbeef67ca34a2054debf1f5b280d509217
---
 Android.mk       | 5 +----
 tests/Android.mk | 1 -
 verifier.cpp     | 4 +---
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Android.mk b/Android.mk
index f8e5ac24a..58b8a2240 100644
--- a/Android.mk
+++ b/Android.mk
@@ -144,15 +144,12 @@ include $(BUILD_EXECUTABLE)
 # libverifier (static library)
 # ===============================
 include $(CLEAR_VARS)
-LOCAL_CLANG := true
 LOCAL_MODULE := libverifier
 LOCAL_MODULE_TAGS := tests
 LOCAL_SRC_FILES := \
     asn1_decoder.cpp \
-    verifier.cpp \
-    ui.cpp
+    verifier.cpp
 LOCAL_STATIC_LIBRARIES := \
-    libminui \
     libcrypto_utils \
     libcrypto \
     libbase
diff --git a/tests/Android.mk b/tests/Android.mk
index 65f736d13..ff6e14c9b 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -120,7 +120,6 @@ LOCAL_STATIC_LIBRARIES := \
     libupdater \
     libbootloader_message \
     libverifier \
-    libminui \
     libotautil \
     libmounts \
     libdivsufsort \
diff --git a/verifier.cpp b/verifier.cpp
index 00e13aa7d..3beaa6e02 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -21,8 +21,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <functional>
 #include <algorithm>
+#include <functional>
 #include <memory>
 
 #include <android-base/logging.h>
@@ -31,9 +31,7 @@
 #include <openssl/obj_mac.h>
 
 #include "asn1_decoder.h"
-#include "common.h"
 #include "print_sha1.h"
-#include "ui.h"
 
 static constexpr size_t MiB = 1024 * 1024;
 
-- 
cgit v1.2.3