From b9d88acdc02a191efafbf74ab201f0de84fe1c67 Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Fri, 14 Sep 2012 14:34:19 -0400 Subject: Move to shared libmincrypt Remove mincrypt source from TWRP and add rule to make libmincrypt as a shared library. No more crashes during zip signature verification and less code to maintain in TWRP. --- Android.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 6c6ee9b28..304e60727 100644 --- a/Android.mk +++ b/Android.mk @@ -37,8 +37,6 @@ LOCAL_SRC_FILES += \ partitionmanager.cpp \ mtdutils/mtdutils.c \ twinstall.cpp \ - twmincrypt/twrsa.c \ - twmincrypt/twsha.c \ twrp-functions.cpp ifeq ($(TARGET_RECOVERY_REBOOT_SRC),) @@ -70,7 +68,7 @@ LOCAL_SHARED_LIBRARIES := LOCAL_STATIC_LIBRARIES += libmtdutils LOCAL_STATIC_LIBRARIES += libext4_utils libminadbd libminzip libunz LOCAL_STATIC_LIBRARIES += libminuitwrp libpixelflinger_static libpng libjpegtwrp libgui -LOCAL_SHARED_LIBRARIES += libz libc libstlport libcutils libstdc++ +LOCAL_SHARED_LIBRARIES += libz libc libstlport libcutils libstdc++ libmincrypt ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) LOCAL_CFLAGS += -DUSE_EXT4 @@ -254,7 +252,9 @@ include $(commands_recovery_local_path)/libjpegtwrp/Android.mk \ $(commands_recovery_local_path)/mtdutils/Android.mk \ $(commands_recovery_local_path)/pigz/Android.mk \ $(commands_recovery_local_path)/crypto/cryptsettings/Android.mk \ - $(commands_recovery_local_path)/libcrecovery/Android.mk + $(commands_recovery_local_path)/libcrecovery/Android.mk \ + $(commands_recovery_local_path)/twmincrypt/Android.mk + ifeq ($(TW_INCLUDE_JB_CRYPTO), true) include $(commands_recovery_local_path)/crypto/fs_mgr/Android.mk -- cgit v1.2.3