commit 2bfd49a3e5b037c89f6f54da85bcd1a3ff4a27c8
author Josh Gao <jmgao@google.com> Fri Feb 24 21:14:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 24 21:14:39 2017 +0000
tree d8794ff977b2308122f9bd454cf7506552afeb76
parent f4bdec6615ebc6bcbc7979d8c85cffcbe855a07e
parent 38a8af3753d232724d3efd9a4da141454cd79561

Merge "Revert "adb: remove win32 dependency on libwinpthread-1.dll."" am: 87eb0fc3d0 am: 00613c52ca
am: f100ad841f

Change-Id: I94a784f37c729291d840bae93c0e3b2647eb92f4

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index c51e0b8..b444afa 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -216,9 +216,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 \
@@ -232,7 +232,7 @@
 LOCAL_LDFLAGS_windows := -municode
 LOCAL_LDLIBS_linux := -lrt -ldl -lpthread
 LOCAL_LDLIBS_darwin := -framework CoreFoundation -framework IOKit -lobjc
-LOCAL_LDLIBS_windows := -lws2_32 -luserenv -static -lwinpthread
+LOCAL_LDLIBS_windows := -lws2_32 -luserenv
 LOCAL_STATIC_LIBRARIES_windows := AdbWinApi
 
 LOCAL_MULTILIB := first
@@ -249,7 +249,7 @@
 
 # Use wmain instead of main
 LOCAL_LDFLAGS_windows := -municode
-LOCAL_LDLIBS_windows := -lws2_32 -lgdi32 -static -lwinpthread
+LOCAL_LDLIBS_windows := -lws2_32 -lgdi32
 LOCAL_STATIC_LIBRARIES_windows := AdbWinApi
 LOCAL_REQUIRED_MODULES_windows := AdbWinApi AdbWinUsbApi