diff options
| author | 2010-10-14 12:03:07 -0700 | |
|---|---|---|
| committer | 2010-10-14 12:03:07 -0700 | |
| commit | 35d34c67b7e94639086f2392d674e59b82c26a42 (patch) | |
| tree | 9d4f08a5b707a78d8787b19668efa975a6625881 | |
| parent | 4fa7f4f4963568258a6b4179176de8386cb5d3db (diff) | |
| parent | 3d828e62c856074334a00ce7c621050b4d7166e4 (diff) | |
am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread
Merge commit '3d828e62c856074334a00ce7c621050b4d7166e4' into gingerbread-plus-aosp
* commit '3d828e62c856074334a00ce7c621050b4d7166e4':
Do not build pbkdf2gen on non-Linux hosts
| -rw-r--r-- | tools/obbtool/Android.mk | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tools/obbtool/Android.mk b/tools/obbtool/Android.mk index 9300bb71b810..98668764a36b 100644 --- a/tools/obbtool/Android.mk +++ b/tools/obbtool/Android.mk @@ -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 |