commit acf4f289da2683614ea5527a59848098aafd1868
author Josh Gao <jmgao@google.com> Fri Apr 14 20:08:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 14 20:08:12 2017 +0000
tree 3b73fbc10ee042774017fddd563749e4039ce56e
parent 2b1ad0ad718c4c46815a5ebc74d98374243bbc9b
parent 855022c0c50999107d776d3fe548ab8a1559a8ad

Merge changes from topics 'adb_thread', 'adb_loopback'
am: 0301b3217b

Change-Id: I18578729590be59de526dbda364627b28503a092

adb/Android.mk

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 \