From 560e65f89972b9149f32b441c46030ec4db6852b Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Mon, 17 Nov 2014 11:37:00 -0600
Subject: Make libmincrypttwrp a shared library

Change-Id: I8c3f084fc34b00edb4cd1b652290df8bc80ea1db
---
 Android.mk                 | 6 ++----
 crypto/lollipop/Android.mk | 4 ++--
 libmincrypt/Android.mk     | 9 ++++++++-
 prebuilt/Android.mk        | 2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Android.mk b/Android.mk
index fc13afc21..5bf90ce48 100644
--- a/Android.mk
+++ b/Android.mk
@@ -442,8 +442,7 @@ LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
 
 LOCAL_MODULE := libfusesideload
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/libmincrypt/includes
-LOCAL_SHARED_LIBRARIES := libcutils libc
-LOCAL_STATIC_LIBRARIES := libmincrypttwrp
+LOCAL_SHARED_LIBRARIES := libcutils libc libmincrypttwrp
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -476,8 +475,7 @@ 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_SHARED_LIBRARIES += libc liblog libcutils libmtdutils libfusesideload
-LOCAL_STATIC_LIBRARIES += libmincrypttwrp
+LOCAL_SHARED_LIBRARIES += libc liblog libcutils libmtdutils libfusesideload libmincrypttwrp
 
 ifneq ($(BOARD_RECOVERY_BLDRMSG_OFFSET),)
     LOCAL_CFLAGS += -DBOARD_RECOVERY_BLDRMSG_OFFSET=$(BOARD_RECOVERY_BLDRMSG_OFFSET)
diff --git a/crypto/lollipop/Android.mk b/crypto/lollipop/Android.mk
index cce070b56..40b4d5f95 100644
--- a/crypto/lollipop/Android.mk
+++ b/crypto/lollipop/Android.mk
@@ -44,9 +44,9 @@ LOCAL_SRC_FILES = cryptfs.c
 #    hardware/libhardware/include/hardware \
 #	system/security/softkeymaster/include/keymaster
 #LOCAL_SHARED_LIBRARIES += libc liblog libcutils libcrypto libext4_utils
-LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
+LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libmincrypttwrp liblogwrap
 LOCAL_C_INCLUDES := external/openssl/include $(common_c_includes)
-LOCAL_STATIC_LIBRARIES += libfs_mgr libscrypt_static liblogwrap libmincrypttwrp
+LOCAL_WHOLE_STATIC_LIBRARIES += libfs_mgr libscrypt_static
 
 include $(BUILD_SHARED_LIBRARY)
 endif
diff --git a/libmincrypt/Android.mk b/libmincrypt/Android.mk
index 034b05fd1..fa6bc7884 100644
--- a/libmincrypt/Android.mk
+++ b/libmincrypt/Android.mk
@@ -14,4 +14,11 @@ LOCAL_MODULE := libmincrypttwrp
 LOCAL_C_INCLUDES := $(commands_recovery_local_path)/libmincrypt/includes
 LOCAL_SRC_FILES := dsa_sig.c p256.c p256_ec.c p256_ecdsa.c rsa.c sha.c sha256.c
 LOCAL_CFLAGS := -Wall -Werror
-include $(BUILD_HOST_STATIC_LIBRARY)
\ No newline at end of file
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmincrypttwrp
+LOCAL_C_INCLUDES := $(commands_recovery_local_path)/libmincrypt/includes
+LOCAL_SRC_FILES := dsa_sig.c p256.c p256_ec.c p256_ecdsa.c rsa.c sha.c sha256.c
+LOCAL_CFLAGS := -Wall -Werror
+include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index dbcf9bf85..7e88da716 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -67,7 +67,7 @@ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbacktrace.so
 RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libunwind.so
 RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libunwind-ptrace.so
 # end libraries from lollipop
-#RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libmincrypt.so
+RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libmincrypttwrp.so
 RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/toolbox
 ifneq ($(TW_OEM_BUILD),true)
     RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/twrp
-- 
cgit v1.2.3