diff options
author | Elliott Hughes <enh@google.com> | 2015-09-11 23:05:31 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-11 23:05:31 +0000 |
commit | 9f0dfbbce1647d43493181e4e9d27d59b3a3b04b (patch) | |
tree | 2dccc348a3c902d3b8f03aeb2e9b5b607b37f6db | |
parent | 27d8d4ea190ba0a7281073713cf7c8966486dcc3 (diff) | |
parent | 69b668c251f22da03515daf99b38d9a8e604ad8c (diff) | |
download | gtest-9f0dfbbce1647d43493181e4e9d27d59b3a3b04b.tar.gz |
am 69b668c2: am 0401a3bf: Merge "add gtest to darwin and windows whitelist for adb_test"
* commit '69b668c251f22da03515daf99b38d9a8e604ad8c':
add gtest to darwin and windows whitelist for adb_test
-rw-r--r-- | src/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Android.mk b/src/Android.mk index 6895fe2..8763244 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -91,6 +91,7 @@ LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs) LOCAL_MODULE := libgtest_host +LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_MULTILIB := both LOCAL_SANITIZE := never LOCAL_RTTI_FLAG := -frtti @@ -108,6 +109,7 @@ LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs) LOCAL_MODULE := libgtest_main_host +LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_MULTILIB := both LOCAL_SANITIZE := never |