commit 75bf041a8ad75f8fc9bba69e937e12b129338a4c
author Ethan Yonker <dees_troy@teamw.in> Fri Nov 21 13:54:27 2014 -0600
committer Ethan Yonker <dees_troy@teamw.in> Tue Dec 02 10:34:15 2014 -0600
tree 9a3202b8c06e075e1749a44948a3a3f184edf95e
parent cdc3ef5feb8421cdb6cd6850c75a7222c049fe23

 Make the android-5.0 branch compile in 4.4 to 4.1

Migrate previous minzip to minzipold replacing the existing
minzipold. This will break compatibility with trees that do not
support selinux (ICS and older). Migrate former verifier files to
verifierold.

Add fuse.h to recovery source because older trees do not have it.

Add LOCAL_MODULE_TAGS where needed for 4.1 tree.

Change-Id: Iade57cb2b0115af7fce9f56aa98636b1744a1ef4

Android.mk

diff --git a/Android.mk b/Android.mk
index 5bf90ce..569ff8b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -84,7 +84,7 @@
 #    libm \
 #    libc
 
-LOCAL_C_INCLUDES += bionic external/stlport/stlport external/openssl/include
+LOCAL_C_INCLUDES += bionic external/stlport/stlport external/openssl/include $(LOCAL_PATH)/libmincrypt/includes
 
 LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES :=
@@ -326,6 +326,11 @@
     LOCAL_CFLAGS += -DHAVE_CAPABILITIES
 endif
 
+# Auto filled build flag
+ifeq ($(PLATFORM_VERSION), 5.0)
+    LOCAL_CFLAGS += -DANDROID_VERSION=5
+endif
+
 LOCAL_LDFLAGS += -Wl,-dynamic-linker,/sbin/linker
 
 LOCAL_ADDITIONAL_DEPENDENCIES := \
@@ -339,8 +344,7 @@
     teamwin \
     toolbox_symlinks \
     twrp \
-    unpigz_symlink \
-    updater
+    unpigz_symlink
 
 ifneq ($(TARGET_ARCH), arm64)
     LOCAL_ADDITIONAL_DEPENDENCIES += \
@@ -439,7 +443,7 @@
 
 LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter
 LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
-
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libfusesideload
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/libmincrypt/includes
 LOCAL_SHARED_LIBRARIES := libcutils libc libmincrypttwrp
@@ -474,7 +478,12 @@
 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 verifier.cpp mtdutils/mtdutils.c legacy_property_service.c
+LOCAL_SRC_FILES := adb_install.cpp asn1_decoder.cpp bootloader.cpp mtdutils/mtdutils.c legacy_property_service.c
+ifeq ($(PLATFORM_VERSION), 5.0)
+    LOCAL_SRC_FILES += verifier.cpp
+else
+    LOCAL_SRC_FILES += verifierold.cpp
+endif
 LOCAL_SHARED_LIBRARIES += libc liblog libcutils libmtdutils libfusesideload libmincrypttwrp
 
 ifneq ($(BOARD_RECOVERY_BLDRMSG_OFFSET),)
@@ -533,7 +542,7 @@
 ifeq ($(TW_INCLUDE_L_CRYPTO), true)
     include $(commands_recovery_local_path)/crypto/lollipop/Android.mk
 endif
-ifeq ($(TWHAVE_SELINUX), true)
+ifeq ($(PLATFORM_VERSION), 5.0)
     include $(commands_recovery_local_path)/minzip/Android.mk
 else
     include $(commands_recovery_local_path)/minzipold/Android.mk