commit e74b613fd84a698797708065670acd820b1babfd
author Stephen Hines <srhines@google.com> Thu Sep 10 22:47:07 2015 -0700
committer Dan Albert <danalbert@google.com> Fri Sep 11 11:39:16 2015 -0700
tree 3a7bebf828814c3548c05f096064bd98faf81ade
parent 4896c410d3b6dbc090aebc35f392d20dca86cee9

Ensure that libbase and liblog can be built for Windows.

Change-Id: If4adf1e2bd7ec36a7f02ae2e263d2db5187c6e7b

base/Android.mk

diff --git a/base/Android.mk b/base/Android.mk
index 51dd736..cb04927 100644
--- a/base/Android.mk
+++ b/base/Android.mk
@@ -78,6 +78,7 @@
 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

liblog/Android.mk

diff --git a/liblog/Android.mk b/liblog/Android.mk
index 3a1a9db..271c6f9 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -50,6 +50,7 @@
 LOCAL_LDLIBS_linux := -lrt
 LOCAL_MULTILIB := both
 LOCAL_CXX_STL := none
+LOCAL_MODULE_HOST_OS := darwin linux windows
 include $(BUILD_HOST_SHARED_LIBRARY)