aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--applypatch/Android.mk2
-rw-r--r--applypatch/bspatch.cpp3
-rw-r--r--applypatch/imgpatch.cpp2
-rw-r--r--applypatch/include/applypatch/applypatch.h3
-rw-r--r--edify/Android.mk16
5 files changed, 24 insertions, 2 deletions
diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index f5dda2bc..db72e8ee 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -53,6 +53,7 @@ LOCAL_C_INCLUDES := \
53 bootable/recovery 53 bootable/recovery
54LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 54LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
55LOCAL_STATIC_LIBRARIES := \ 55LOCAL_STATIC_LIBRARIES := \
56 libedify \
56 libcrypto \ 57 libcrypto \
57 libbspatch \ 58 libbspatch \
58 libbase \ 59 libbase \
@@ -77,6 +78,7 @@ LOCAL_C_INCLUDES := \
77 bootable/recovery 78 bootable/recovery
78LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 79LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
79LOCAL_STATIC_LIBRARIES := \ 80LOCAL_STATIC_LIBRARIES := \
81 libedify \
80 libcrypto \ 82 libcrypto \
81 libbspatch \ 83 libbspatch \
82 libbase \ 84 libbase \
diff --git a/applypatch/bspatch.cpp b/applypatch/bspatch.cpp
index 65ee614e..b2f29fbd 100644
--- a/applypatch/bspatch.cpp
+++ b/applypatch/bspatch.cpp
@@ -30,6 +30,7 @@
30#include <openssl/sha.h> 30#include <openssl/sha.h>
31 31
32#include "applypatch/applypatch.h" 32#include "applypatch/applypatch.h"
33#include "edify/expr.h"
33#include "print_sha1.h" 34#include "print_sha1.h"
34 35
35void ShowBSDiffLicense() { 36void ShowBSDiffLicense() {
@@ -91,4 +92,4 @@ int ApplyBSDiffPatch(const unsigned char* old_data, size_t old_size, const Value
91 } 92 }
92 } 93 }
93 return result; 94 return result;
94} \ No newline at end of file 95}
diff --git a/applypatch/imgpatch.cpp b/applypatch/imgpatch.cpp
index df75f98d..7a43ddbe 100644
--- a/applypatch/imgpatch.cpp
+++ b/applypatch/imgpatch.cpp
@@ -37,6 +37,8 @@
37#include <openssl/sha.h> 37#include <openssl/sha.h>
38#include <zlib.h> 38#include <zlib.h>
39 39
40#include "edify/expr.h"
41
40static inline int64_t Read8(const void *address) { 42static inline int64_t Read8(const void *address) {
41 return android::base::get_unaligned<int64_t>(address); 43 return android::base::get_unaligned<int64_t>(address);
42} 44}
diff --git a/applypatch/include/applypatch/applypatch.h b/applypatch/include/applypatch/applypatch.h
index 581360ef..2a3b3ef3 100644
--- a/applypatch/include/applypatch/applypatch.h
+++ b/applypatch/include/applypatch/applypatch.h
@@ -27,7 +27,8 @@
27 27
28#include <openssl/sha.h> 28#include <openssl/sha.h>
29 29
30#include "edify/expr.h" 30// Forward declaration to avoid including "edify/expr.h" in the header.
31struct Value;
31 32
32struct FileContents { 33struct FileContents {
33 uint8_t sha1[SHA_DIGEST_LENGTH]; 34 uint8_t sha1[SHA_DIGEST_LENGTH];
diff --git a/edify/Android.mk b/edify/Android.mk
index cec65f42..fbf2b1b0 100644
--- a/edify/Android.mk
+++ b/edify/Android.mk
@@ -34,3 +34,19 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
34LOCAL_STATIC_LIBRARIES += libbase 34LOCAL_STATIC_LIBRARIES += libbase
35 35
36include $(BUILD_STATIC_LIBRARY) 36include $(BUILD_STATIC_LIBRARY)
37
38#
39# Build the host-side library (static library)
40#
41include $(CLEAR_VARS)
42
43LOCAL_SRC_FILES := $(edify_src_files)
44
45LOCAL_CFLAGS := -Wall -Werror
46LOCAL_CPPFLAGS := -Wno-unused-parameter
47LOCAL_CPPFLAGS += -Wno-deprecated-register
48LOCAL_MODULE := libedify
49LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
50LOCAL_STATIC_LIBRARIES += libbase
51
52include $(BUILD_HOST_STATIC_LIBRARY)