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
---
 twinstall.cpp | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'twinstall.cpp')

diff --git a/twinstall.cpp b/twinstall.cpp
index 01bd67278..91a1a3595 100644
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -33,15 +33,9 @@
 #include "minui/minui.h"
 #include "mtdutils/mounts.h"
 #include "mtdutils/mtdutils.h"
-#if (ANDROID_VERSION >= 5)
 #include "minzip/SysUtil.h"
 #include "minzip/Zip.h"
 #include "verifier.h"
-#else
-#include "verifierold.h"
-#include "minzipold/SysUtil.h"
-#include "minzipold/Zip.h"
-#endif
 #include "variables.h"
 #include "data.hpp"
 #include "partitions.hpp"
@@ -279,44 +273,30 @@ extern "C" int TWinstall_zip(const char* path, int* wipe_cache) {
 #endif
 	DataManager::SetProgress(0);
 
-#if (ANDROID_VERSION >= 5)
 	MemMapping map;
 	if (sysMapFile(path, &map) != 0) {
 		LOGERR("Failed to sysMapFile '%s'\n", path);
         return -1;
     }
-#endif
 
 	if (zip_verify) {
 		gui_print("Verifying zip signature...\n");
-#if (ANDROID_VERSION >= 5)
 		ret_val = verify_file(map.addr, map.length);
-#else
-		ret_val = verify_file(path);
-#endif
 		if (ret_val != VERIFY_SUCCESS) {
 			LOGERR("Zip signature verification failed: %i\n", ret_val);
-#if (ANDROID_VERSION >= 5)
 			sysReleaseMap(&map);
-#endif
 			return -1;
+		} else {
+			gui_print("Zip signature verified successfully.\n");
 		}
 	}
-#if (ANDROID_VERSION >= 5)
 	ret_val = mzOpenZipArchive(map.addr, map.length, &Zip);
-#else
-	ret_val = mzOpenZipArchive(path, &Zip);
-#endif
 	if (ret_val != 0) {
 		LOGERR("Zip file is corrupt!\n", path);
-#if (ANDROID_VERSION >= 5)
 		sysReleaseMap(&map);
-#endif
 		return INSTALL_CORRUPT;
 	}
 	ret_val = Run_Update_Binary(path, &Zip, wipe_cache);
-#if (ANDROID_VERSION >= 5)
 	sysReleaseMap(&map);
-#endif
 	return ret_val;
 }
-- 
cgit v1.2.3