Merge changes from topics 'adb_thread', 'adb_loopback' am: 0301b3217b am: 750dfee974
am: da1f886ed8
Change-Id: I0a20514a043312c069e81166cd7b980ce3e54490
diff --git a/adb/Android.mk b/adb/Android.mk
index 94ccc08..d17b063 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -220,9 +220,9 @@
LOCAL_SRC_FILES_darwin := $(LIBADB_TEST_darwin_SRCS)
LOCAL_SRC_FILES_windows := $(LIBADB_TEST_windows_SRCS)
LOCAL_SANITIZE := $(adb_host_sanitize)
-LOCAL_SHARED_LIBRARIES := libbase
LOCAL_STATIC_LIBRARIES := \
libadb \
+ libbase \
libcrypto_utils \
libcrypto \
libcutils \