aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2016-04-26 23:01:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-26 23:01:57 +0000
commitb688b3ca564cdd9a32882e3b20160cffab4b1e0f (patch)
treea75349206cb2aa637215e4033358577f4ce036f7
parente4e99a3731619492ec1882fd85e63f1b76988fb2 (diff)
parentbb7fb4e07c39765517b6bedb7e558e0fa7d27e5c (diff)
downloadgtest-b688b3ca564cdd9a32882e3b20160cffab4b1e0f.tar.gz
Merge "Allow libgtest_prod on Windows."
am: bb7fb4e * commit 'bb7fb4e07c39765517b6bedb7e558e0fa7d27e5c': Allow libgtest_prod on Windows. Change-Id: I6decfb74ce873faab6889ec57ec924d137322310
-rw-r--r--src/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Android.mk b/src/Android.mk
index 7d502c3..83deaa9 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -239,4 +239,5 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libgtest_prod
LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
+LOCAL_MODULE_HOST_OS := darwin linux windows
include $(BUILD_HOST_STATIC_LIBRARY)