diff options
| author | Tao Bao <tbao@google.com> | 2017-03-20 17:32:24 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-20 17:32:24 +0100 |
| commit | b7d07f7b1e12b858cd88dc72900abf370def25cf (patch) | |
| tree | 191089eb63400a778540b342954f57725b3f0d3b | |
| parent | resolve merge conflicts of 90d3f20c to stage-aosp-master am: 553c7bd307 (diff) | |
| parent | Merge "Remove the dead #include's in verifier.cpp." am: 64d25024b9 (diff) | |
| download | android_bootable_recovery-b7d07f7b1e12b858cd88dc72900abf370def25cf.tar android_bootable_recovery-b7d07f7b1e12b858cd88dc72900abf370def25cf.tar.gz android_bootable_recovery-b7d07f7b1e12b858cd88dc72900abf370def25cf.tar.bz2 android_bootable_recovery-b7d07f7b1e12b858cd88dc72900abf370def25cf.tar.lz android_bootable_recovery-b7d07f7b1e12b858cd88dc72900abf370def25cf.tar.xz android_bootable_recovery-b7d07f7b1e12b858cd88dc72900abf370def25cf.tar.zst android_bootable_recovery-b7d07f7b1e12b858cd88dc72900abf370def25cf.zip | |
| -rw-r--r-- | Android.mk | 5 | ||||
| -rw-r--r-- | tests/Android.mk | 1 | ||||
| -rw-r--r-- | 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 582c498fb..6daeac94e 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; |