commit 91a034974cf2d9f020d69598cfad45f13abd27c0
author Tao Bao <tbao@google.com> Mon Oct 09 21:30:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 09 21:30:26 2017 +0000
tree c0e7891b1bb6b43a7f7d91b44b946b57adf30fbb
parent 622253f29f7ad47f619cc41a09a75bc370c2fae7
parent b53d8c6062ccf265260df582198e4396df5fd9dd

Merge "applypatch: Forward declare struct Value." am: 7a3fc2de8e am: b7c0ce4201
am: b53d8c6062

Change-Id: I4f0fb9418a41fe815f4cce89c3889ddd42bd35b1

applypatch/Android.mk

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index f5dda2b..db72e8e 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -53,6 +53,7 @@
     bootable/recovery
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_STATIC_LIBRARIES := \
+    libedify \
     libcrypto \
     libbspatch \
     libbase \
@@ -77,6 +78,7 @@
     bootable/recovery
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_STATIC_LIBRARIES := \
+    libedify \
     libcrypto \
     libbspatch \
     libbase \

applypatch/bspatch.cpp

diff --git a/applypatch/bspatch.cpp b/applypatch/bspatch.cpp
index 65ee614..b2f29fb 100644
--- a/applypatch/bspatch.cpp
+++ b/applypatch/bspatch.cpp
@@ -30,6 +30,7 @@
 #include <openssl/sha.h>
 
 #include "applypatch/applypatch.h"
+#include "edify/expr.h"
 #include "print_sha1.h"
 
 void ShowBSDiffLicense() {
@@ -91,4 +92,4 @@
     }
   }
   return result;
-}
\ No newline at end of file
+}

applypatch/imgpatch.cpp

diff --git a/applypatch/imgpatch.cpp b/applypatch/imgpatch.cpp
index df75f98..7a43ddb 100644
--- a/applypatch/imgpatch.cpp
+++ b/applypatch/imgpatch.cpp
@@ -37,6 +37,8 @@
 #include <openssl/sha.h>
 #include <zlib.h>
 
+#include "edify/expr.h"
+
 static inline int64_t Read8(const void *address) {
   return android::base::get_unaligned<int64_t>(address);
 }

applypatch/include/applypatch/applypatch.h

diff --git a/applypatch/include/applypatch/applypatch.h b/applypatch/include/applypatch/applypatch.h
index 581360e..2a3b3ef 100644
--- a/applypatch/include/applypatch/applypatch.h
+++ b/applypatch/include/applypatch/applypatch.h
@@ -27,7 +27,8 @@
 
 #include <openssl/sha.h>
 
-#include "edify/expr.h"
+// Forward declaration to avoid including "edify/expr.h" in the header.
+struct Value;
 
 struct FileContents {
   uint8_t sha1[SHA_DIGEST_LENGTH];

edify/Android.mk

diff --git a/edify/Android.mk b/edify/Android.mk
index cec65f4..fbf2b1b 100644
--- a/edify/Android.mk
+++ b/edify/Android.mk
@@ -34,3 +34,19 @@
 LOCAL_STATIC_LIBRARIES += libbase
 
 include $(BUILD_STATIC_LIBRARY)
+
+#
+# Build the host-side library (static library)
+#
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(edify_src_files)
+
+LOCAL_CFLAGS := -Wall -Werror
+LOCAL_CPPFLAGS := -Wno-unused-parameter
+LOCAL_CPPFLAGS += -Wno-deprecated-register
+LOCAL_MODULE := libedify
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
+LOCAL_STATIC_LIBRARIES += libbase
+
+include $(BUILD_HOST_STATIC_LIBRARY)