commit f8679ca560310665d269fa3c8acf83333af01f7e
author Josh Gao <jmgao@google.com> Wed Feb 22 02:15:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 22 02:15:21 2017 +0000
tree fa9d8206e8dbd472721c72866cdeb11593712557
parent afa5bef59348f3f1a8f54abc14da75f8ce69b653
parent cc7f1ef372f114820fa327ac8b6edad50aa685d4

Merge "adb: remove win32 dependency on libwinpthread-1.dll." am: 1d73abb443 am: ef260561f3
am: b17ca7f367

Change-Id: I4545e81ce41a8e18c9b31d79fb1f98035c9c3cc3

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index b444afa..c51e0b8 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
+LOCAL_LDLIBS_windows := -lws2_32 -luserenv -static -lwinpthread
 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
+LOCAL_LDLIBS_windows := -lws2_32 -lgdi32 -static -lwinpthread
 LOCAL_STATIC_LIBRARIES_windows := AdbWinApi
 LOCAL_REQUIRED_MODULES_windows := AdbWinApi AdbWinUsbApi