Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3222df8d authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am ec62719c: am 004f968d: Merge "Link against the static libcrypto in... 

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

Merge commit 'ec62719c'

* commit 'ec62719c':
  Link against the static libcrypto in external/openssl.
parents 3027855f ec62719c

tools/obbtool/Android.mk

+11 −14
Original line number Diff line number Diff line
@@ -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



    LOCAL_SHARED_LIBRARIES := libcrypto

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



#######################################################

endif # TARGET_BUILD_APPS