Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 738be7a3 authored by Ethan Yonker's avatar Ethan Yonker
Browse files

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
parent ceb7b8e5

Android.mk

+3 −17
Original line number Diff line number Diff line
@@ -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

gui/Android.mk

+0 −5
Original line number Diff line number Diff line
@@ -81,11 +81,6 @@ ifeq ($(TW_CUSTOM_THEME),) 
	endif

endif



# Auto filled build flag

ifeq ($(PLATFORM_VERSION), 5.0.1)

    LOCAL_CFLAGS += -DANDROID_VERSION=5

endif



LOCAL_C_INCLUDES += bionic external/stlport/stlport $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION)



include $(BUILD_STATIC_LIBRARY)

gui/blanktimer.cpp

+0 −5
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@ extern "C" { 
#include "../data.hpp"

extern "C" {

#include "../twcommon.h"

#ifdef HAVE_SELINUX

#include "../minzip/Zip.h"

#else

#include "../minzipold/Zip.h"

#endif

}

#include "../twrp-functions.hpp"

#include "../variables.h"

gui/gui.cpp

+0 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ extern "C" 
{

#include "../twcommon.h"

#include "../minuitwrp/minui.h"

#ifdef HAVE_SELINUX

#include "../minzip/Zip.h"

#else

#include "../minzipold/Zip.h"

#endif

#include <pixelflinger/pixelflinger.h>

}

gui/objects.hpp

+0 −8
Original line number Diff line number Diff line
@@ -28,14 +28,6 @@ 
#include <set>

#include <time.h>



extern "C" {

#ifdef HAVE_SELINUX

#include "../minzip/Zip.h"

#else

#include "../minzipold/Zip.h"

#endif

}



using namespace rapidxml;



#include "../data.hpp"