diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-09 19:49:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-09 19:49:23 +0000 |
| commit | ef213b6d5b5c5e8d9403c7d41724c815d2831055 (patch) | |
| tree | 711989a50b5b6ccbe6b8ff09ceb69f2697a3ab4b /adb | |
| parent | a1e27d342e05fc504ce7140463d17336c53a1af8 (diff) | |
| parent | b0449da977d85f17d92b83912271910a364c9f2b (diff) | |
| download | system_core-ef213b6d5b5c5e8d9403c7d41724c815d2831055.tar.gz system_core-ef213b6d5b5c5e8d9403c7d41724c815d2831055.tar.bz2 system_core-ef213b6d5b5c5e8d9403c7d41724c815d2831055.zip | |
Merge "adb/fastboot: switch over to shared AdbWinApi."
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/Android.mk | 6 |
1 files changed, 3 insertions, 3 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 \ |