diff options
| author | Ying Wang <wangying@google.com> | 2010-10-19 09:52:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 09:52:16 -0700 |
| commit | 3222df8d835c23ceaefc7e4782bb2d5146bb4112 (patch) | |
| tree | 2f094b24c4614f58d72eae474440d1cc53d34daf | |
| parent | 3027855fb0d7cc32963aed892cac865c866fa87c (diff) | |
| parent | ec62719c8396997b436c44906c2760e3914698b8 (diff) | |
| download | frameworks_base-3222df8d835c23ceaefc7e4782bb2d5146bb4112.zip frameworks_base-3222df8d835c23ceaefc7e4782bb2d5146bb4112.tar.gz frameworks_base-3222df8d835c23ceaefc7e4782bb2d5146bb4112.tar.bz2 | |
am ec62719c: am 004f968d: Merge "Link against the static libcrypto in external/openssl." into gingerbread
Merge commit 'ec62719c8396997b436c44906c2760e3914698b8'
* commit 'ec62719c8396997b436c44906c2760e3914698b8':
Link against the static libcrypto in external/openssl.
| -rw-r--r-- | tools/obbtool/Android.mk | 25 |
1 files changed, 11 insertions, 14 deletions
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 |