commit b2617e882edaecb67b8ca74eba8ac4d4014e203e
author Tao Bao <tbao@google.com> Mon Mar 20 16:24:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 20 16:24:23 2017 +0000
tree 4b772efe4a00a539bb4b7e818ce4c1cb484ad091
parent 553c7bd307ef27537bf8cb05162ba7e9da76ae95
parent 64d25024b9ab0bfdb4053e2ab9985f6a7e858d2d

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

Change-Id: I36aed07781b1b9bff0ffe6cabeb5d1f3b8546072

Android.mk

diff --git a/Android.mk b/Android.mk
index f8e5ac2..58b8a22 100644
--- a/Android.mk
+++ b/Android.mk
@@ -144,15 +144,12 @@
 # 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

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 65f736d..ff6e14c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -120,7 +120,6 @@
     libupdater \
     libbootloader_message \
     libverifier \
-    libminui \
     libotautil \
     libmounts \
     libdivsufsort \

verifier.cpp

diff --git a/verifier.cpp b/verifier.cpp
index 582c498..6daeac9 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;