diff options
| author | Elliott Hughes <enh@google.com> | 2015-09-11 23:19:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-11 23:19:48 +0000 |
| commit | 31fb3dd403bb9e8c9e975be65555600310fc8c30 (patch) | |
| tree | 4888f8087d7662e6276d77c08a842acfe7e9b4ca | |
| parent | 8f573d46209297a734ab5e37e23a3ac72810612d (diff) | |
| parent | 9f0dfbbce1647d43493181e4e9d27d59b3a3b04b (diff) | |
| download | gtest-31fb3dd403bb9e8c9e975be65555600310fc8c30.tar.gz | |
am 9f0dfbbc: am 69b668c2: am 0401a3bf: Merge "add gtest to darwin and windows whitelist for adb_test"studio-master-dev_before_27917934studio-master-dev_before_26911779studio-1.5gradle_1.5.0
* commit '9f0dfbbce1647d43493181e4e9d27d59b3a3b04b':
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 |