am 933f4fd4: Merge "Ensure that libbase and liblog can be built for Windows."

* commit '933f4fd413f5a6c0e32c7963f1d0da580085df38':
  Ensure that libbase and liblog can be built for Windows.
This commit is contained in:
Dan Albert 2015-09-11 22:14:35 +00:00 committed by Android Git Automerger
commit 8569a3b322
2 changed files with 2 additions and 0 deletions

View file

@ -79,6 +79,7 @@ LOCAL_SHARED_LIBRARIES := liblog
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_STATIC_LIBRARIES := libcutils
LOCAL_MULTILIB := both
LOCAL_MODULE_HOST_OS := darwin linux windows
include $(BUILD_HOST_SHARED_LIBRARY)
# Tests

View file

@ -50,6 +50,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := liblog
LOCAL_LDLIBS_linux := -lrt
LOCAL_MULTILIB := both
LOCAL_CXX_STL := none
LOCAL_MODULE_HOST_OS := darwin linux windows
include $(BUILD_HOST_SHARED_LIBRARY)