libtwrpgui: convert gui to use new ziparchive library

Change-Id: Iea94855257c6d02c2f663c25d390cb1cfb91a727

Android.mk

@@ -42,9 +42,6 @@ endif
 
 include $(CLEAR_VARS)
 
-TWRES_PATH := /twres/
-TWHTCD_PATH := $(TWRES_PATH)htcd/
-
 TARGET_RECOVERY_GUI := true
 
 LOCAL_STATIC_LIBRARIES :=
@@ -88,7 +85,6 @@ LOCAL_C_INCLUDES += \
     system/gsid/include/ \
     system/core/init/ \
     system/extras/ext4_utils/include \
-    $(LOCAL_PATH)/twinstall/include
 
 ifneq ($(TARGET_RECOVERY_REBOOT_SRC),)
   LOCAL_SRC_FILES += $(TARGET_RECOVERY_REBOOT_SRC)
@@ -114,6 +110,8 @@ LOCAL_C_INCLUDES += \
     external/boringssl/include \
     external/libcxx/include \
     external/libselinux/include \
+    external/libpng \
+    $(LOCAL_PATH)/gui/include \
     $(LOCAL_PATH)/recovery_ui/include \
     $(LOCAL_PATH)/otautil/include \
     $(LOCAL_PATH)/install/include \
@@ -121,7 +119,9 @@ LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/install/include \
     $(LOCAL_PATH)/twrpinstall/include \
     $(LOCAL_PATH)/recovery_utils/include \
-    $(LOCAL_PATH)/libpixelflinger/include
+    $(LOCAL_PATH)/libpixelflinger/include \
+    $(LOCAL_PATH)/minuitwrp/include \
+    $(LOCAL_PATH)/twinstall/include
 
 LOCAL_STATIC_LIBRARIES += libguitwrp
 LOCAL_SHARED_LIBRARIES += libz libc libcutils libstdc++ libtar libblkid libminuitwrp libmtdutils libtwadbbu 
@@ -404,7 +404,9 @@ TWRP_REQUIRED_MODULES += \
     twrpbu \
     adbd_system_api_recovery \
     me.twrp.twrpapp.apk \
-    privapp-permissions-twrpapp.xml
+    privapp-permissions-twrpapp.xml \
+    adbd_system_api_recovery \
+    libsync.recovery
 
 ifneq ($(TW_EXCLUDE_TZDATA), true)
 TWRP_REQUIRED_MODULES += \
@@ -500,8 +502,6 @@ endif
 ifneq ($(TARGET_RECOVERY_DEVICE_MODULES),)
     TWRP_REQUIRED_MODULES += $(TARGET_RECOVERY_DEVICE_MODULES)
 endif
-LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"
-LOCAL_CFLAGS += -DTWHTCD_PATH=\"$(TWHTCD_PATH)\"
 ifeq ($(TW_INCLUDE_NTFS_3G),true)
     TWRP_REQUIRED_MODULES += \
         mount.ntfs \