Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 004f968d: Merge "Link against the static libcrypto in external/openssl." into gingerbread

Browse Source 
Merge commit '004f968d0cf60c08d7b393129ed2d6e4304041e5' into gingerbread-plus-aosp

* commit '004f968d0cf60c08d7b393129ed2d6e4304041e5':
  Link against the static libcrypto in external/openssl.
This commit is contained in:
Ying Wang
2010-10-18 11:50:08 -07:00
committed by Android Git Automerger
parent 8f5214eb6f 004f968d0c
commit ec62719c83
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/obbtool/Android.mk
View File

@@ -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)
#####################################################
include $(CLEAR_VARS)
LOCAL_MODULE := pbkdf2gen
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
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := -Wall -Werror
LOCAL_SRC_FILES := pbkdf2gen.cpp
LOCAL_SHARED_LIBRARIES := libcrypto
include $(BUILD_HOST_EXECUTABLE)
endif # HOST_OS == linux
include $(BUILD_HOST_EXECUTABLE)
#######################################################
endif # TARGET_BUILD_APPS