commit d81833a5e5ee8e1e5ee557ec71e9d7bf76497170
author bigbiff <bigbiff@teamw.in> Sun Jan 17 11:06:57 2021 -0500
committer bigbiff <bigbiff@teamw.in> Sat Apr 24 18:56:46 2021 -0400
tree 5eae80823b00707e764da8ac58a233b1bced1eb0
parent 28653c98b0d679b677d8b99c65af04191b9aa9c8

libtwrpgui: convert gui to use new ziparchive library

Change-Id: Iea94855257c6d02c2f663c25d390cb1cfb91a727

Android.mk

diff --git a/Android.mk b/Android.mk
index 23a3b3f..3a57d04 100755
--- a/Android.mk
+++ b/Android.mk
@@ -42,9 +42,6 @@
 
 include $(CLEAR_VARS)
 
-TWRES_PATH := /twres/
-TWHTCD_PATH := $(TWRES_PATH)htcd/
-
 TARGET_RECOVERY_GUI := true
 
 LOCAL_STATIC_LIBRARIES :=
@@ -88,7 +85,6 @@
     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 @@
     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_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 @@
     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 @@
 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 \