diff options
| author | David Pursell <dpursell@google.com> | 2016-01-21 16:40:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-21 16:40:00 +0000 |
| commit | 1906de1e0fb70dbae4a713620072113a76d0a22a (patch) | |
| tree | e6b7c50843464758b64dc882d6b02613431db3a1 /fastboot/Android.mk | |
| parent | b4cf452aad90dfd4b0040764831fe6976a2366a9 (diff) | |
| parent | 0eb8e1b706b577194bab1e23fab5b7d20d5259f1 (diff) | |
| download | core-1906de1e0fb70dbae4a713620072113a76d0a22a.tar.gz core-1906de1e0fb70dbae4a713620072113a76d0a22a.tar.bz2 core-1906de1e0fb70dbae4a713620072113a76d0a22a.zip | |
Merge "libcutils: share Windows networking code."
Diffstat (limited to 'fastboot/Android.mk')
| -rw-r--r-- | fastboot/Android.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 8cbc79bb7..bb28afab5 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -34,10 +34,10 @@ LOCAL_CFLAGS += -Wall -Wextra -Werror -Wunreachable-code LOCAL_CFLAGS += -DFASTBOOT_REVISION='"$(fastboot_version)"' LOCAL_SRC_FILES_linux := socket_unix.cpp usb_linux.cpp util_linux.cpp -LOCAL_STATIC_LIBRARIES_linux := libcutils libselinux +LOCAL_STATIC_LIBRARIES_linux := libselinux LOCAL_SRC_FILES_darwin := socket_unix.cpp usb_osx.cpp util_osx.cpp -LOCAL_STATIC_LIBRARIES_darwin := libcutils libselinux +LOCAL_STATIC_LIBRARIES_darwin := libselinux LOCAL_LDLIBS_darwin := -lpthread -framework CoreFoundation -framework IOKit -framework Carbon LOCAL_CFLAGS_darwin := -Wno-unused-parameter @@ -56,6 +56,7 @@ LOCAL_STATIC_LIBRARIES := \ libz \ libdiagnose_usb \ libbase \ + libcutils \ # libf2fs_dlutils_host will dlopen("libf2fs_fmt_host_dyn") LOCAL_CFLAGS_linux := -DUSE_F2FS @@ -98,17 +99,15 @@ LOCAL_MODULE := fastboot_test LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_SRC_FILES := socket_test.cpp -LOCAL_STATIC_LIBRARIES := libbase +LOCAL_STATIC_LIBRARIES := libbase libcutils LOCAL_CFLAGS += -Wall -Wextra -Werror -Wunreachable-code LOCAL_SRC_FILES_linux := socket_unix.cpp -LOCAL_STATIC_LIBRARIES_linux := libcutils LOCAL_SRC_FILES_darwin := socket_unix.cpp LOCAL_LDLIBS_darwin := -lpthread -framework CoreFoundation -framework IOKit -framework Carbon LOCAL_CFLAGS_darwin := -Wno-unused-parameter -LOCAL_STATIC_LIBRARIES_darwin := libcutils LOCAL_SRC_FILES_windows := socket_windows.cpp LOCAL_LDLIBS_windows := -lws2_32 |