Merge changes from topics 'adb_thread', 'adb_loopback'

am: 0301b3217b

Change-Id: I18578729590be59de526dbda364627b28503a092
This commit is contained in:
Josh Gao 2017-04-14 20:08:12 +00:00 committed by android-build-merger
commit 750dfee974

View file

@ -220,9 +220,9 @@ LOCAL_SRC_FILES_linux := $(LIBADB_TEST_linux_SRCS)
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 \