Merge "applypatch: Forward declare struct Value."

am: 7a3fc2de8e

Change-Id: I1ac5bb6eda60d9d9728ce149d2e9cbc37b82acac

applypatch/Android.mk

@@ -53,6 +53,7 @@ LOCAL_C_INCLUDES := \
     bootable/recovery
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_STATIC_LIBRARIES := \
+    libedify \
     libcrypto \
     libbspatch \
     libbase \
@@ -77,6 +78,7 @@ LOCAL_C_INCLUDES := \
     bootable/recovery
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_STATIC_LIBRARIES := \
+    libedify \
     libcrypto \
     libbspatch \
     libbase \

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() {

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

@@ -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

@@ -34,3 +34,19 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 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)