diff options
| author | Ying Wang <wangying@google.com> | 2010-10-18 11:50:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 11:50:08 -0700 |
| commit | ec62719c8396997b436c44906c2760e3914698b8 (patch) | |
| tree | 65ac99ded31c48cf278ce7056cf84acff4e59eaa /tools | |
| parent | 8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17 (diff) | |
| parent | 004f968d0cf60c08d7b393129ed2d6e4304041e5 (diff) | |
| download | frameworks_base-ec62719c8396997b436c44906c2760e3914698b8.zip frameworks_base-ec62719c8396997b436c44906c2760e3914698b8.tar.gz frameworks_base-ec62719c8396997b436c44906c2760e3914698b8.tar.bz2 | |
am 004f968d: Merge "Link against the static libcrypto in external/openssl." into gingerbread
Merge commit '004f968d0cf60c08d7b393129ed2d6e4304041e5' into gingerbread-plus-aosp
* commit '004f968d0cf60c08d7b393129ed2d6e4304041e5':
Link against the static libcrypto in external/openssl.
Diffstat (limited to 'tools')
| -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 |