commit f4d4e9a75846df1ba15a3f6a956f0e5cbf37b000
author Dan Albert <danalbert@google.com> Tue Feb 24 22:15:12 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 24 22:15:12 2015 +0000
tree 08601c884f374b07ade5f6af321b85be127573c3
parent 916903eb3f1271f61346ac3ac1672f8bbb943f4b
parent a52682812fd6db1362792ff258df3c4be1b82fdc

am a63b7d59: Merge "Fix Windows SDK build."

* commit 'a63b7d595b9cb35b7493662daf8840835229c7fb':
  Fix Windows SDK build.

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index fb7a3f3..2656268 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -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 := \