commit 10fe5fe2a8535a5703d818a3fd08900cf412c09e
author Dan Albert <danalbert@google.com> Fri Sep 11 22:14:35 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 11 22:14:35 2015 +0000
tree 591ec22aa6f58594bfc4fafbcd0f3738db399fec
parent d4513740b4f2a48f1b5e803b3acb586e1b6e4728
parent 9704a71966370f85d5e83416dfdfd8cf7a880d4b

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.

base/Android.mk

diff --git a/base/Android.mk b/base/Android.mk
index a09a747..ebc2e07 100644
--- a/base/Android.mk
+++ b/base/Android.mk
@@ -79,6 +79,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)