From 38d78d19b9482e7bbad756f0cdbf533cbb52a8f8 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Mon, 9 Oct 2017 11:03:38 -0700
Subject: applypatch: Forward declare struct Value.

And move '#include "edify/expr.h"' into .cpp files. This breaks the
transitive dependency on libedify. Modules that include
"applypatch/applypatch.h" don't need to add libedify into their
dependency list, unless they really need anything from libedify.

Build libedify static library for host, which is needed by
libimgpatch.

Test: mmma bootable/recovery
Change-Id: Ibb53d322579fcbf593438d058d9bcee240625941
---
 edify/Android.mk | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'edify/Android.mk')

diff --git a/edify/Android.mk b/edify/Android.mk
index cec65f42a..fbf2b1b06 100644
--- a/edify/Android.mk
+++ b/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)
-- 
cgit v1.2.3