commit 1dd1419b58ebb78b113e4d38832affa89586bbef
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 39edf12da8a2d01d0a7329a6c7ba1f683affa3b3
parent a77792a2b74b2a3a43c7cec873a037a012c85233
parent 3187510b17f7eeeb67286a4a842abd503906bb5c

Merge changes from topics 'adb_thread', 'adb_loopback'
am: 3187510b17

Change-Id: I18578729590be59de526dbda364627b28503a092

Android.mk

diff --git a/Android.mk b/Android.mk
index 94ccc08..d17b063 100644
--- a/Android.mk
+++ b/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 \