am a63b7d59: Merge "Fix Windows SDK build."

* commit 'a63b7d595b9cb35b7493662daf8840835229c7fb':
  Fix Windows SDK build.
This commit is contained in:
Dan Albert 2015-02-24 22:15:12 +00:00 committed by Android Git Automerger
commit 4868ec8cc2
1 changed files with 4 additions and 1 deletions

View File

@ -57,6 +57,10 @@ LOCAL_SRC_FILES := \
# 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 @@ ifeq ($(HOST_OS),windows)
LOCAL_LDLIBS += -lws2_32 -lgdi32
USE_SYSDEPS_WIN32 := 1
endif
LOCAL_C_INCLUDES += development/host/windows/usb/api/
endif
LOCAL_SRC_FILES := \