diff options
| author | Benoit Goby <benoit@android.com> | 2012-08-31 17:44:27 -0700 |
|---|---|---|
| committer | Benoit Goby <benoit@android.com> | 2012-08-31 18:24:07 -0700 |
| commit | 345ca131bbc17b1ae1073db04f37f6610ccb4c71 (patch) | |
| tree | 08f65c33481199c465708462910d3d1d23371b2a /adb | |
| parent | 59680145c85522e8b4b8cc928a48e105d966a44b (diff) | |
| download | system_core-345ca131bbc17b1ae1073db04f37f6610ccb4c71.zip system_core-345ca131bbc17b1ae1073db04f37f6610ccb4c71.tar.gz system_core-345ca131bbc17b1ae1073db04f37f6610ccb4c71.tar.bz2 | |
adb: Link statically with libcrypto
Bug: 7063951
Change-Id: I328b76a751aceaae625d64156f22ce3de65678c8
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/Android.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 681c7c7..49d9601 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -17,26 +17,24 @@ ifeq ($(HOST_OS),linux) USB_SRCS := usb_linux.c EXTRA_SRCS := get_my_path_linux.c LOCAL_LDLIBS += -lrt -lncurses -lpthread - LOCAL_SHARED_LIBRARIES := libcrypto endif ifeq ($(HOST_OS),darwin) USB_SRCS := usb_osx.c EXTRA_SRCS := get_my_path_darwin.c - LOCAL_LDLIBS += -lpthread -lcrypto -framework CoreFoundation -framework IOKit -framework Carbon + LOCAL_LDLIBS += -lpthread -framework CoreFoundation -framework IOKit -framework Carbon endif ifeq ($(HOST_OS),freebsd) USB_SRCS := usb_libusb.c EXTRA_SRCS := get_my_path_freebsd.c LOCAL_LDLIBS += -lpthread -lusb - LOCAL_SHARED_LIBRARIES := libcrypto endif ifeq ($(HOST_OS),windows) USB_SRCS := usb_windows.c EXTRA_SRCS := get_my_path_windows.c ../libcutils/list.c - EXTRA_STATIC_LIBS := AdbWinApi libcrypto_static + EXTRA_STATIC_LIBS := AdbWinApi ifneq ($(strip $(USE_CYGWIN)),) # Pure cygwin case LOCAL_LDLIBS += -lpthread -lgdi32 @@ -80,7 +78,7 @@ LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE LOCAL_MODULE := adb -LOCAL_STATIC_LIBRARIES := libzipfile libunz $(EXTRA_STATIC_LIBS) +LOCAL_STATIC_LIBRARIES := libzipfile libunz libcrypto_static $(EXTRA_STATIC_LIBS) ifeq ($(USE_SYSDEPS_WIN32),) LOCAL_STATIC_LIBRARIES += libcutils endif |