From b0e4f0822638742fdfe8d92b2d8b59d4cda9a91e Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Thu, 10 Sep 2015 22:47:07 -0700 Subject: [PATCH] Ensure that libbase and liblog can be built for Windows. Change-Id: If4adf1e2bd7ec36a7f02ae2e263d2db5187c6e7b --- base/Android.mk | 1 + liblog/Android.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/base/Android.mk b/base/Android.mk index 51dd73600..cb04927f8 100644 --- a/base/Android.mk +++ b/base/Android.mk @@ -78,6 +78,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 diff --git a/liblog/Android.mk b/liblog/Android.mk index 3a1a9db7a..271c6f95b 100644 --- a/liblog/Android.mk +++ b/liblog/Android.mk @@ -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)