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

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

Browse Source 
Merge commit '3d828e62c856074334a00ce7c621050b4d7166e4' into gingerbread-plus-aosp

* commit '3d828e62c856074334a00ce7c621050b4d7166e4':
  Do not build pbkdf2gen on non-Linux hosts
This commit is contained in:
Joe Onorato
2010-10-14 12:03:07 -07:00
committed by Android Git Automerger
parent 4fa7f4f496 3d828e62c8
commit 35d34c67b7
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/obbtool/Android.mk
View File

@@ -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