commit b48e3980291f7548b129f262017f27f1fc0d52bd
author Mark Salyzyn <salyzyn@google.com> Tue Feb 24 22:30:48 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 24 22:30:49 2015 +0000
tree b62f7a4c3a26737d7b7eea3219a5048a2515a600
parent a28889b4a7b3787ccc773e1ba41339bbec55490c
parent 2b8bddf0061a8491476e0802ea77116962e904e5

Merge "init: grab-bootchart.sh: run bootchart and display results"

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index fb7a3f3..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
 
@@ -57,6 +57,10 @@
 # this to take effect), this adds the SSL includes to our path.
 LOCAL_STATIC_LIBRARIES := libcrypto_static
 
+ifeq ($(HOST_OS),windows)
+    LOCAL_C_INCLUDES += development/host/windows/usb/api/
+endif
+
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # adb host tool
@@ -80,7 +84,6 @@
     LOCAL_LDLIBS += -lws2_32 -lgdi32
     USE_SYSDEPS_WIN32 := 1
   endif
-  LOCAL_C_INCLUDES += development/host/windows/usb/api/
 endif
 
 LOCAL_SRC_FILES := \