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

Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread

Browse Source
This commit is contained in:
Joe Onorato
2010-10-14 10:59:37 -07:00
committed by Android (Google) Code Review
parent 53ea7f58c0 a09f1ebeb5
commit 3d828e62c8
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/obbtool/Android.mk
View File

@@ -29,18 +29,21 @@ LOCAL_MODULE := obbtool
include $(BUILD_HOST_EXECUTABLE)
include $(CLEAR_VARS)
# Non-Linux hosts might not have OpenSSL libcrypto
ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
LOCAL_MODULE := pbkdf2gen
LOCAL_MODULE := pbkdf2gen
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := -Wall -Werror
LOCAL_CFLAGS := -Wall -Werror
LOCAL_SRC_FILES := pbkdf2gen.cpp
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