am aaf4fcf4: Merge "Remove HOST_OS==windows check"

* commit 'aaf4fcf482d427459c70e10a22fef5ea9c7bca1a':
  Remove HOST_OS==windows check
This commit is contained in:
Dan Willemsen 2015-09-09 18:19:15 +00:00 committed by Android Git Automerger
commit a376c046bf

View file

@ -118,9 +118,7 @@ LOCAL_SANITIZE := $(adb_host_sanitize)
LOCAL_STATIC_LIBRARIES := libcrypto_static libbase LOCAL_STATIC_LIBRARIES := libcrypto_static libbase
LOCAL_C_INCLUDES_windows := development/host/windows/usb/api/ LOCAL_C_INCLUDES_windows := development/host/windows/usb/api/
ifneq ($(HOST_OS),windows) LOCAL_MULTILIB := first
LOCAL_MULTILIB := 64
endif
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)