diff options
| author | Dees Troy <dees_troy@teamw.in> | 2013-11-03 14:03:55 +0100 |
|---|---|---|
| committer | Dees Troy <dees_troy@teamw.in> | 2013-11-03 14:06:10 +0100 |
| commit | d63c7643fd7749de1723ce1adc5907fed1c1a11c (patch) | |
| tree | e849392b599e13df8d6b3c82ba562a8f50ca94fb | |
| parent | Fix updater makefiles (diff) | |
| download | android_bootable_recovery-d63c7643fd7749de1723ce1adc5907fed1c1a11c.tar android_bootable_recovery-d63c7643fd7749de1723ce1adc5907fed1c1a11c.tar.gz android_bootable_recovery-d63c7643fd7749de1723ce1adc5907fed1c1a11c.tar.bz2 android_bootable_recovery-d63c7643fd7749de1723ce1adc5907fed1c1a11c.tar.lz android_bootable_recovery-d63c7643fd7749de1723ce1adc5907fed1c1a11c.tar.xz android_bootable_recovery-d63c7643fd7749de1723ce1adc5907fed1c1a11c.tar.zst android_bootable_recovery-d63c7643fd7749de1723ce1adc5907fed1c1a11c.zip | |
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | applypatch/Android.mk | 6 | ||||
| -rw-r--r-- | verifier_test.cpp | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 9781541ef..aa176136d 100644 --- a/Android.mk +++ b/Android.mk @@ -289,12 +289,13 @@ include $(CLEAR_VARS) LOCAL_MODULE := verifier_test LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_MODULE_TAGS := tests +LOCAL_C_INCLUDES := bootable/recovery/libmincrypt/includes LOCAL_SRC_FILES := \ verifier_test.cpp \ verifier.cpp \ ui.cpp LOCAL_STATIC_LIBRARIES := \ - libmincrypt \ + libmincrypttwrp \ libminui \ libcutils \ libstdc++ \ diff --git a/applypatch/Android.mk b/applypatch/Android.mk index b39bc408a..61d904ec6 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -19,7 +19,7 @@ LOCAL_SRC_FILES := applypatch.c bspatch.c freecache.c imgpatch.c utils.c LOCAL_MODULE := libapplypatch LOCAL_MODULE_TAGS := eng LOCAL_C_INCLUDES += external/bzip2 external/zlib bootable/recovery -LOCAL_STATIC_LIBRARIES += libmtdutils libmincrypt libbz libz +LOCAL_STATIC_LIBRARIES += libmtdutils libmincrypttwrp libbz libz include $(BUILD_STATIC_LIBRARY) @@ -28,7 +28,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := main.c LOCAL_MODULE := applypatch LOCAL_C_INCLUDES += bootable/recovery -LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypt libbz libminelf +LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypttwrp libbz libminelf LOCAL_SHARED_LIBRARIES += libz libcutils libstdc++ libc include $(BUILD_EXECUTABLE) @@ -40,7 +40,7 @@ LOCAL_MODULE := applypatch_static LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_MODULE_TAGS := eng LOCAL_C_INCLUDES += bootable/recovery -LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypt libbz libminelf +LOCAL_STATIC_LIBRARIES += libapplypatch libmtdutils libmincrypttwrp libbz libminelf LOCAL_STATIC_LIBRARIES += libz libcutils libstdc++ libc include $(BUILD_EXECUTABLE) diff --git a/verifier_test.cpp b/verifier_test.cpp index 1063cbae5..20aa3d1de 100644 --- a/verifier_test.cpp +++ b/verifier_test.cpp @@ -18,7 +18,9 @@ #include <stdlib.h> #include <stdarg.h> +/* #include "common.h" +*/ #include "verifier.h" #include "ui.h" #include "mincrypt/sha.h" @@ -163,7 +165,10 @@ int main(int argc, char **argv) { ui = new FakeUI(); +/* int result = verify_file(*argv, cert, num_keys); +*/ + int result = verify_file(*argv); if (result == VERIFY_SUCCESS) { printf("VERIFIED\n"); return 0; |