resolve merge conflicts of 715d8a203a to master.

Change-Id: Ic868ee9b27ef7251aa49ac814de7355ecd9c7d37
2016-02-05 15:27:52 -08:00
parent e284cd58c8 715d8a203a
commit ca78c9f035
7 changed files with 204 additions and 303 deletions
@@ -55,7 +55,9 @@ LOCAL_CLANG := true
 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)