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

Commit 35d34c67 authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread 

Merge commit '3d828e62' into gingerbread-plus-aosp

* commit '3d828e62':
  Do not build pbkdf2gen on non-Linux hosts
parents 4fa7f4f4 3d828e62

tools/obbtool/Android.mk

+10 −7
Original line number Original line Diff line number Diff line
@@ -29,6 +29,8 @@ LOCAL_MODULE := obbtool 




include $(BUILD_HOST_EXECUTABLE)

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
@@ -42,5 +44,6 @@ LOCAL_SRC_FILES := pbkdf2gen.cpp 
    LOCAL_SHARED_LIBRARIES := libcrypto

    LOCAL_SHARED_LIBRARIES := libcrypto





    include $(BUILD_HOST_EXECUTABLE)

    include $(BUILD_HOST_EXECUTABLE)

endif # HOST_OS == linux





endif # TARGET_BUILD_APPS
 
endif # TARGET_BUILD_APPS