aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2013-07-25 15:54:23 +0530
committerUbuntu <vishal.bhoj@linaro.org>2014-06-05 10:01:57 +0000
commitccf2648ead15af427d016067bec2176ce189e0d4 (patch)
treedebf5c45177796831f15004e98871be32b276f07
parentc1b568a32c8cdfb7d31bbdb1145ec6b99713479c (diff)
adb: Link to libdl manually to avoid build failure on android-build
An outdated build environment results in a host adb build failure because libcrypto needs libdl, but libdl isn't linked explicitly: out/host/linux-x86/obj/STATIC_LIBRARIES/libcrypto_static_intermediates/libcrypto_static.a(dso_dlfcn.o): In function `dlfcn_globallookup': /mnt/jenkins/workspace/linaro-android_galaxynexus-jb-gcc47-aosp-blob/build/external/openssl/crypto/dso/dso_dlfcn.c:474: undefined reference to `dlopen' /mnt/jenkins/workspace/linaro-android_galaxynexus-jb-gcc47-aosp-blob/build/external/openssl/crypto/dso/dso_dlfcn.c:478: undefined reference to `dlsym' /mnt/jenkins/workspace/linaro-android_galaxynexus-jb-gcc47-aosp-blob/build/external/openssl/crypto/dso/dso_dlfcn.c:479: undefined reference to `dlclose' Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-rw-r--r--adb/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/adb/Android.mk b/adb/Android.mk
index ab30b871..2698c0ba 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -89,6 +89,7 @@ LOCAL_MODULE := adb
LOCAL_MODULE_TAGS := debug
LOCAL_STATIC_LIBRARIES := libzipfile libunz libcrypto_static $(EXTRA_STATIC_LIBS)
+LOCAL_LDLIBS += -ldl
ifeq ($(USE_SYSDEPS_WIN32),)
LOCAL_STATIC_LIBRARIES += libcutils
endif