commit ca78c9f035569b323b537f9300ded8f92bce485f
author Yabin Cui <yabinc@google.com> Fri Feb 05 15:27:52 2016 -0800
committer Yabin Cui <yabinc@google.com> Fri Feb 05 15:27:52 2016 -0800
tree a3afdd888cb91cb4587e1230e0a8638bdb1a912f
parent e284cd58c8724815cee73de65b1ddcc60cec6249
parent 715d8a203a2e7c163bda248ffc4a547c97964b33

resolve merge conflicts of 715d8a203a to master.

Change-Id: Ic868ee9b27ef7251aa49ac814de7355ecd9c7d37

applypatch/Android.mk

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 481de05..887a570 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -55,7 +55,9 @@
 LOCAL_SRC_FILES := main.cpp
 LOCAL_MODULE := applypatch
 LOCAL_C_INCLUDES += bootable/recovery
-LOCAL_STATIC_LIBRARIES += libapplypatch libbase libotafault libmtdutils libcrypto_static libbz
+LOCAL_STATIC_LIBRARIES += libapplypatch libbase libotafault libmtdutils libcrypto_static libbz \
+                          libedify \
+
 LOCAL_SHARED_LIBRARIES += libz libcutils libc
 
 include $(BUILD_EXECUTABLE)