ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adb/fastboot: switch over to shared AdbWinApi."

Browse source
This commit is contained in:
Treehugger Robot 2018-01-09 19:49:23 +00:00 • committed by Gerrit Code Review
commit ef213b6d5b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/Android.mk
View file

@ -237,7 +237,7 @@ LOCAL_LDFLAGS_windows := -municode
LOCAL_LDLIBS_linux := -lrt -ldl -lpthread LOCAL_LDLIBS_linux := -lrt -ldl -lpthread
LOCAL_LDLIBS_darwin := -framework CoreFoundation -framework IOKit -lobjc LOCAL_LDLIBS_darwin := -framework CoreFoundation -framework IOKit -lobjc
LOCAL_LDLIBS_windows := -lws2_32 -luserenv LOCAL_LDLIBS_windows := -lws2_32 -luserenv
LOCAL_STATIC_LIBRARIES_windows := AdbWinApi LOCAL_SHARED_LIBRARIES_windows := AdbWinApi
LOCAL_MULTILIB := first LOCAL_MULTILIB := first
@ -254,8 +254,8 @@ LOCAL_LDLIBS_darwin := -lpthread -framework CoreFoundation -framework IOKit -fra
# Use wmain instead of main # Use wmain instead of main
LOCAL_LDFLAGS_windows := -municode LOCAL_LDFLAGS_windows := -municode
LOCAL_LDLIBS_windows := -lws2_32 -lgdi32 LOCAL_LDLIBS_windows := -lws2_32 -lgdi32
LOCAL_STATIC_LIBRARIES_windows := AdbWinApi LOCAL_SHARED_LIBRARIES_windows := AdbWinApi
LOCAL_REQUIRED_MODULES_windows := AdbWinApi AdbWinUsbApi LOCAL_REQUIRED_MODULES_windows := AdbWinUsbApi
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
adb_client.cpp \ adb_client.cpp \

4
fastboot/Android.mk
View file

@ -50,8 +50,8 @@ LOCAL_LDLIBS_darwin := -lpthread -framework CoreFoundation -framework IOKit -fra
LOCAL_CFLAGS_darwin := -Wno-unused-parameter LOCAL_CFLAGS_darwin := -Wno-unused-parameter
LOCAL_SRC_FILES_windows := usb_windows.cpp LOCAL_SRC_FILES_windows := usb_windows.cpp
LOCAL_STATIC_LIBRARIES_windows := AdbWinApi LOCAL_SHARED_LIBRARIES_windows := AdbWinApi
LOCAL_REQUIRED_MODULES_windows := AdbWinApi AdbWinUsbApi LOCAL_REQUIRED_MODULES_windows := AdbWinUsbApi
LOCAL_LDLIBS_windows := -lws2_32 LOCAL_LDLIBS_windows := -lws2_32
LOCAL_C_INCLUDES_windows := development/host/windows/usb/api LOCAL_C_INCLUDES_windows := development/host/windows/usb/api