PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix building of other utilities

Browse Source 
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
This commit is contained in:
Dees Troy
2013-11-03 13:03:55 +00:00
parent ce8d8931ce
commit d63c7643fd
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk
+2 -1
View File
@@ -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++ \
applypatch/Android.mk
+3 -3
View File
@@ -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)
verifier_test.cpp
+5
View File
@@ -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;