From b0449da977d85f17d92b83912271910a364c9f2b Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Mon, 8 Jan 2018 16:45:30 -0800 Subject: [PATCH] adb/fastboot: switch over to shared AdbWinApi. Bug: http://b/71721338 Test: manually ran adb/fastboot on windows Change-Id: I9fee6ea4c0e07cbeb69a48e456161832a5994e7b --- adb/Android.mk | 6 +++--- fastboot/Android.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adb/Android.mk b/adb/Android.mk index d76d17534..0eeafb63c 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -237,7 +237,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_STATIC_LIBRARIES_windows := AdbWinApi +LOCAL_SHARED_LIBRARIES_windows := AdbWinApi LOCAL_MULTILIB := first @@ -254,8 +254,8 @@ LOCAL_LDLIBS_darwin := -lpthread -framework CoreFoundation -framework IOKit -fra # Use wmain instead of main LOCAL_LDFLAGS_windows := -municode LOCAL_LDLIBS_windows := -lws2_32 -lgdi32 -LOCAL_STATIC_LIBRARIES_windows := AdbWinApi -LOCAL_REQUIRED_MODULES_windows := AdbWinApi AdbWinUsbApi +LOCAL_SHARED_LIBRARIES_windows := AdbWinApi +LOCAL_REQUIRED_MODULES_windows := AdbWinUsbApi LOCAL_SRC_FILES := \ adb_client.cpp \ diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 10ef35681..dfcf090b7 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -50,8 +50,8 @@ LOCAL_LDLIBS_darwin := -lpthread -framework CoreFoundation -framework IOKit -fra LOCAL_CFLAGS_darwin := -Wno-unused-parameter LOCAL_SRC_FILES_windows := usb_windows.cpp -LOCAL_STATIC_LIBRARIES_windows := AdbWinApi -LOCAL_REQUIRED_MODULES_windows := AdbWinApi AdbWinUsbApi +LOCAL_SHARED_LIBRARIES_windows := AdbWinApi +LOCAL_REQUIRED_MODULES_windows := AdbWinUsbApi LOCAL_LDLIBS_windows := -lws2_32 LOCAL_C_INCLUDES_windows := development/host/windows/usb/api