From 738be7a3ffec0a4053478d49821c7da9c5fd9ee6 Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Wed, 10 Dec 2014 11:40:43 -0600
Subject: Use one mizip for all

The new minzip did not compile in older trees due to needing
mmap64. For older trees we will just use mmap instead. Remove all
files and code pertaining to minzipold. Updater should now build
properly in older trees as well.

Eliminate use of PLATFORM_VERSION in favor of PLATFORM_SDK_VERSION
which should be more consistent and reliable.

Change-Id: I38d2b604a73d1b17a2072c7d60e990b81ece0c10
---
 Android.mk | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index e10fef108..130575fea 100644
--- a/Android.mk
+++ b/Android.mk
@@ -302,11 +302,6 @@ ifneq ($(wildcard bionic/libc/include/sys/capability.h),)
     LOCAL_CFLAGS += -DHAVE_CAPABILITIES
 endif
 
-# Auto filled build flag
-ifeq ($(PLATFORM_VERSION), 5.0.1)
-    LOCAL_CFLAGS += -DANDROID_VERSION=5
-endif
-
 LOCAL_ADDITIONAL_DEPENDENCIES := \
     dump_image \
     erase_image \
@@ -451,12 +446,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libaosprecovery
 LOCAL_MODULE_TAGS := eng optional
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/libmincrypt/includes
-LOCAL_SRC_FILES := adb_install.cpp asn1_decoder.cpp bootloader.cpp mtdutils/mtdutils.c legacy_property_service.c
-ifeq ($(PLATFORM_VERSION), 5.0.1)
-    LOCAL_SRC_FILES += verifier.cpp
-else
-    LOCAL_SRC_FILES += verifierold.cpp
-endif
+LOCAL_SRC_FILES := adb_install.cpp asn1_decoder.cpp bootloader.cpp mtdutils/mtdutils.c legacy_property_service.c verifier.cpp
 LOCAL_SHARED_LIBRARIES += libc liblog libcutils libmtdutils libfusesideload libmincrypttwrp
 
 ifneq ($(BOARD_RECOVERY_BLDRMSG_OFFSET),)
@@ -493,7 +483,8 @@ include $(commands_recovery_local_path)/injecttwrp/Android.mk \
     $(commands_recovery_local_path)/toolbox/Android.mk \
     $(commands_recovery_local_path)/libmincrypt/Android.mk \
     $(commands_recovery_local_path)/twrpTarMain/Android.mk \
-    $(commands_recovery_local_path)/mtp/Android.mk
+    $(commands_recovery_local_path)/mtp/Android.mk \
+    $(commands_recovery_local_path)/minzip/Android.mk
 
 ifneq ($(TARGET_ARCH), arm64)
     include $(commands_recovery_local_path)/dosfstools/Android.mk
@@ -503,11 +494,6 @@ ifeq ($(TW_INCLUDE_CRYPTO), true)
     include $(commands_recovery_local_path)/crypto/lollipop/Android.mk
     include $(commands_recovery_local_path)/crypto/scrypt/Android.mk
 endif
-ifeq ($(PLATFORM_VERSION), 5.0.1)
-    include $(commands_recovery_local_path)/minzip/Android.mk
-else
-    include $(commands_recovery_local_path)/minzipold/Android.mk
-endif
 ifeq ($(BUILD_ID), GINGERBREAD)
     TW_NO_EXFAT := true
 endif
-- 
cgit v1.2.3