ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix Windows SDK build."

Browse source
This commit is contained in:
Dan Albert 2015-02-24 22:09:58 +00:00 • committed by Gerrit Code Review
commit a63b7d595b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adb/Android.mk
View file

@ -57,6 +57,10 @@ LOCAL_SRC_FILES := \
# this to take effect), this adds the SSL includes to our path. # this to take effect), this adds the SSL includes to our path.
LOCAL_STATIC_LIBRARIES := libcrypto_static LOCAL_STATIC_LIBRARIES := libcrypto_static
ifeq ($(HOST_OS),windows)
LOCAL_C_INCLUDES += development/host/windows/usb/api/
endif
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
# adb host tool # adb host tool
@ -80,7 +84,6 @@ ifeq ($(HOST_OS),windows)
LOCAL_LDLIBS += -lws2_32 -lgdi32 LOCAL_LDLIBS += -lws2_32 -lgdi32
USE_SYSDEPS_WIN32 := 1 USE_SYSDEPS_WIN32 := 1
endif endif
LOCAL_C_INCLUDES += development/host/windows/usb/api/
endif endif
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \