diff options
| author | Elliott Hughes <enh@google.com> | 2015-09-11 18:01:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-11 18:01:59 +0000 |
| commit | 0401a3bf116e438b2fe7749604f5ea0c6bc996e2 (patch) | |
| tree | 2dccc348a3c902d3b8f03aeb2e9b5b607b37f6db | |
| parent | 5ab45219a6ad07cc30e6b58fd09371e2a14b93ed (diff) | |
| parent | 7f4fe570b4f3b19c0eda94176ae52b564112c436 (diff) | |
| download | gtest-0401a3bf116e438b2fe7749604f5ea0c6bc996e2.tar.gz | |
Merge "add gtest to darwin and windows whitelist for adb_test"studio-1.2-release
| -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 |