From a1b592e60dee58aaaf66ce430f3dbe36cf0448bb Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 14 Oct 2010 16:13:31 -0700 Subject: Link against the static libcrypto in external/openssl. Change-Id: Iad41ec975f9b9a4aec0b8470678320f5abe03e1f --- tools/obbtool/Android.mk | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'tools') diff --git a/tools/obbtool/Android.mk b/tools/obbtool/Android.mk index 9866876..d118bd7 100644 --- a/tools/obbtool/Android.mk +++ b/tools/obbtool/Android.mk @@ -29,21 +29,18 @@ LOCAL_MODULE := obbtool include $(BUILD_HOST_EXECUTABLE) -# Non-Linux hosts might not have OpenSSL libcrypto -ifeq ($(HOST_OS),linux) - include $(CLEAR_VARS) - - LOCAL_MODULE := pbkdf2gen - - LOCAL_MODULE_TAGS := optional - - LOCAL_CFLAGS := -Wall -Werror - - LOCAL_SRC_FILES := pbkdf2gen.cpp +##################################################### +include $(CLEAR_VARS) - LOCAL_SHARED_LIBRARIES := libcrypto +LOCAL_MODULE := pbkdf2gen +LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS := -Wall -Werror +LOCAL_SRC_FILES := pbkdf2gen.cpp +LOCAL_LDLIBS += -ldl +LOCAL_C_INCLUDES := external/openssl/include $(LOCAL_C_INCLUDES) +LOCAL_STATIC_LIBRARIES := libcrypto_static - include $(BUILD_HOST_EXECUTABLE) -endif # HOST_OS == linux +include $(BUILD_HOST_EXECUTABLE) +####################################################### endif # TARGET_BUILD_APPS -- cgit v1.1