diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-04-26 23:05:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-26 23:05:21 +0000 |
| commit | 6cc1304d7c8a3d66aace1b52e3ac114bd3eb8316 (patch) | |
| tree | 381311b787cb5d1fd09be4e4868f909ffdc60048 | |
| parent | 86e2e9377cdaeca7ca0fb8db4a9029ebe5c5c751 (diff) | |
| parent | b688b3ca564cdd9a32882e3b20160cffab4b1e0f (diff) | |
| download | gtest-6cc1304d7c8a3d66aace1b52e3ac114bd3eb8316.tar.gz | |
Merge "Allow libgtest_prod on Windows." am: bb7fb4e
am: b688b3c
* commit 'b688b3ca564cdd9a32882e3b20160cffab4b1e0f':
Allow libgtest_prod on Windows.
Change-Id: I07723bba49ba399c5c74025022c228a48f92972d
| -rw-r--r-- | src/Android.mk | 1 |
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) |