Merge "Remove the dead #include's in verifier.cpp." am: 64d25024b9

am: b2617e882e

Change-Id: I8b99bd307e38e4dc4a477bf3ae2bd89495434507

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 \
+    verifier.cpp
-    ui.cpp
 LOCAL_STATIC_LIBRARIES := \
-    libminui \
     libcrypto_utils \
     libcrypto \
     libbase

tests/Android.mk

@@ -120,7 +120,6 @@ LOCAL_STATIC_LIBRARIES := \
     libupdater \
     libbootloader_message \
     libverifier \
-    libminui \
     libotautil \
     libmounts \
     libdivsufsort \

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;