Support excluding zip from TWRP builds

Use 'TW_EXCLUDE_ZIP := true' to activate the exclusion

It will be excluded by default if 'TW_OEM_BUILD := true' is set

Change-Id: I970343e3342a6bfa6c5a5684a8934f1ffa2af78b

Author: DarthJabba9

Android.mk

@@ -147,6 +147,7 @@ ifeq ($(TW_OEM_BUILD),true)
     TW_EXCLUDE_TZDATA := true
     TW_EXCLUDE_NANO := true
     TW_EXCLUDE_BASH := true
+    TW_EXCLUDE_ZIP := true
 endif
 
 ifeq ($(AB_OTA_UPDATER),true)
@@ -570,8 +571,10 @@ TWRP_REQUIRED_MODULES += \
 endif
 
 ifneq ($(wildcard external/zip/Android.mk),)
+ifneq ($(TW_EXCLUDE_ZIP), true)
     TWRP_REQUIRED_MODULES += zip
 endif
+endif
 ifneq ($(wildcard external/unzip/Android.mk),)
     TWRP_REQUIRED_MODULES += unzip
 endif

prebuilt/Android.mk

@@ -24,8 +24,10 @@ LOCAL_POST_INSTALL_CMD += $(hide) if [ -e "$(TARGET_RECOVERY_ROOT_OUT)/system/bi
 							rm $(TARGET_RECOVERY_ROOT_OUT)/system/bin/fgrep; fi; ln -s $(TARGET_RECOVERY_ROOT_OUT)/system/bin/grep $(TARGET_RECOVERY_ROOT_OUT)/system/bin/fgrep;
 
 ifneq ($(wildcard external/zip/Android.mk),)
+ifneq ($(TW_EXCLUDE_ZIP), true)
 	RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/zip
 endif
+endif
 ifneq ($(wildcard external/unzip/Android.mk),)
 	RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/unzip
 endif
@@ -575,4 +577,3 @@ ifneq ($(TW_EXCLUDE_BASH), true)
         ln -sf /system/bin/bash $(TARGET_RECOVERY_ROOT_OUT)/sbin/bash;
 	include $(BUILD_PHONY_PACKAGE)
 endif
-