Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba269e7a authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

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

am: 77b62701

Change-Id: I5ff69d62d1ee3e3eaca81a73dd6d2ca4ae60e45f
parents adc63a09 77b62701

adb/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -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 \

fastboot/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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