commit 38f19be3a2d6bba60335bd72c4e644b915d64eca
author Josh Gao <jmgao@google.com> Fri Apr 14 20:10:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 14 20:10:04 2017 +0000
tree 0ab051770381608b3b0dfdee58fe1105f19be515
parent 57c4002e2336f070de77ce425d9ea90d3ee4b81b
parent acf4f289da2683614ea5527a59848098aafd1868

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

Change-Id: I0553a8c70ac8a04bd2a32138e2bdd5f63e894258

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 \