Fix updater binary for 7.0
Note: updater is currently not backwards compatible with older trees. Maybe
later...
Change-Id: I3c2a5ef69cfa9005502408f7054e3096a64ba34b
diff --git a/updater/Android.mk b/updater/Android.mk
index b85fe55..23ba592 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -33,27 +33,13 @@
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 @@
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