| commit | d6e9a1f5a357663ce4a42155829420b263996eb3 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Feb 24 22:28:54 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Feb 24 22:28:54 2015 +0000 |
| tree | 058e160b92d4a589aba8e6d8003c8e23a686c2a1 | |
| parent | a63b7d595b9cb35b7493662daf8840835229c7fb [diff] | |
| parent | fdf8722491cf5fd21b5d897578c24fec4bb62682 [diff] |
Merge "Fix Mac build."
diff --git a/adb/Android.mk b/adb/Android.mk index 2656268..327591f 100644 --- a/adb/Android.mk +++ b/adb/Android.mk
@@ -28,7 +28,7 @@ -D_XOPEN_SOURCE -D_GNU_SOURCE \ -fvisibility=hidden \ -LIBADB_darwin_SRC_FILES := get_my_path_darwin.c usb_osx.c +LIBADB_darwin_SRC_FILES := fdevent.cpp get_my_path_darwin.c usb_osx.c LIBADB_linux_SRC_FILES := fdevent.cpp get_my_path_linux.c usb_linux.c LIBADB_windows_SRC_FILES := get_my_path_windows.c sysdeps_win32.c usb_windows.c