commit d63c7643fd7749de1723ce1adc5907fed1c1a11c
author Dees Troy <dees_troy@teamw.in> Sun Nov 03 13:03:55 2013 +0000
committer Dees Troy <dees_troy@teamw.in> Sun Nov 03 13:06:10 2013 +0000
tree e849392b599e13df8d6b3c82ba562a8f50ca94fb
parent ce8d8931cecf7f6a7a2241474e10581af2f8483a

Fix building of other utilities

Fix building all applypatch items
Fix building verifier_test (probably will not work right as-is)
but at least it builds without errors.

Change-Id: I7ab0c04d7d3d2c2e14b57480627e594f89a68b0b

Android.mk

diff --git a/Android.mk b/Android.mk
index 9781541..aa17613 100644
--- a/Android.mk
+++ b/Android.mk
@@ -289,12 +289,13 @@
 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++ \

applypatch/Android.mk

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index b39bc40..61d904e 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -19,7 +19,7 @@
 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 @@
 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_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)

verifier_test.cpp

diff --git a/verifier_test.cpp b/verifier_test.cpp
index 1063cba..20aa3d1 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 @@
 
     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;