From b8e985c6a29dff748a44ffc9a142c8244ae18099 Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Wed, 31 Aug 2016 13:42:11 -0500
Subject: Fix updater binary for 7.0

Note: updater is currently not backwards compatible with older trees. Maybe
later...

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

(limited to 'updater')

diff --git a/updater/Android.mk b/updater/Android.mk
index b85fe557c..23ba592a8 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -33,27 +33,13 @@ LOCAL_CLANG := true
 
 LOCAL_SRC_FILES := $(updater_src_files)
 
-LOCAL_STATIC_LIBRARIES += libfec libfec_rs libext4_utils_static libsquashfs_utils libcrypto_static
+LOCAL_STATIC_LIBRARIES += libfec libfec_rs libsquashfs_utils libcrypto_static
 
 ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
 LOCAL_CFLAGS += -DUSE_EXT4
 LOCAL_CFLAGS += -Wno-unused-parameter
 LOCAL_C_INCLUDES += system/extras/ext4_utils
-LOCAL_STATIC_LIBRARIES += \
-    libext4_utils \
-    libz
-ifneq ($(wildcard system/core/libmincrypt/rsa_e_3.c),)
-LOCAL_STATIC_LIBRARIES = \
-    libext4_utils_static \
-    libsparse_static \
-    libz
-endif
-ifneq ($(wildcard system/core/include/mincrypt/sha256.h),)
-LOCAL_STATIC_LIBRARIES = \
-    libext4_utils_static \
-    libsparse_static \
-    libz
-endif
+LOCAL_STATIC_LIBRARIES += libext4_utils_static libsparse_static
 ifneq ($(wildcard external/lz4/Android.mk),)
     LOCAL_STATIC_LIBRARIES += liblz4
 endif
@@ -62,7 +48,7 @@ endif
 LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS)
 LOCAL_STATIC_LIBRARIES += libapplypatch libbase libotafault libedify libmtdutils libminzip libz
 LOCAL_STATIC_LIBRARIES += libflashutils libmmcutils libbmlutils
-LOCAL_STATIC_LIBRARIES += libmincrypttwrp libbz
+LOCAL_STATIC_LIBRARIES += libbz
 LOCAL_STATIC_LIBRARIES += libcutils liblog libc
 LOCAL_STATIC_LIBRARIES += libselinux
 
-- 
cgit v1.2.3