diff options
| author | Joe Onorato <joeo@google.com> | 2010-10-15 14:25:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 14:25:59 -0700 |
| commit | 78fc85ce64379d36f6a8f955149c7532db1e84ba (patch) | |
| tree | d449980704b790411812ab833cd458e2ee66766b /tools | |
| parent | 672a2531ae69f3a9bc14bd534ad33e540a38672a (diff) | |
| parent | 35d34c67b7e94639086f2392d674e59b82c26a42 (diff) | |
| download | frameworks_base-78fc85ce64379d36f6a8f955149c7532db1e84ba.zip frameworks_base-78fc85ce64379d36f6a8f955149c7532db1e84ba.tar.gz frameworks_base-78fc85ce64379d36f6a8f955149c7532db1e84ba.tar.bz2 | |
am 35d34c67: am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread
Merge commit '35d34c67b7e94639086f2392d674e59b82c26a42'
* commit '35d34c67b7e94639086f2392d674e59b82c26a42':
Do not build pbkdf2gen on non-Linux hosts
Diffstat (limited to 'tools')
| -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 9300bb7..9866876 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 |