resolved conflicts for merge of 64893ccc to master
diff --git a/Android.mk b/Android.mk
index f04f7dd..deec80a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,7 +9,6 @@
LOCAL_SRC_FILES := \
recovery.c \
bootloader.c \
- commands.c \
firmware.c \
install.c \
roots.c \
@@ -38,14 +37,13 @@
else
LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB)
endif
-LOCAL_STATIC_LIBRARIES += libminzip libunz libamend libmtdutils libmincrypt
+LOCAL_STATIC_LIBRARIES += libminzip libunz libmtdutils libmincrypt
LOCAL_STATIC_LIBRARIES += libminui libpixelflinger_static libpng libcutils
LOCAL_STATIC_LIBRARIES += libstdc++ libc
include $(BUILD_EXECUTABLE)
include $(commands_recovery_local_path)/minui/Android.mk
-include $(commands_recovery_local_path)/amend/Android.mk
include $(commands_recovery_local_path)/minzip/Android.mk
include $(commands_recovery_local_path)/mtdutils/Android.mk
include $(commands_recovery_local_path)/tools/Android.mk