commit 69b668c251f22da03515daf99b38d9a8e604ad8c
author Elliott Hughes <enh@google.com> Fri Sep 11 22:14:16 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 11 22:14:16 2015 +0000
tree 2dccc348a3c902d3b8f03aeb2e9b5b607b37f6db
parent db071fb781de9b34f7e1a7b081b18fae89f8a7a9
parent 0401a3bf116e438b2fe7749604f5ea0c6bc996e2

am 0401a3bf: Merge "add gtest to darwin and windows whitelist for adb_test"

* commit '0401a3bf116e438b2fe7749604f5ea0c6bc996e2':
  add gtest to darwin and windows whitelist for adb_test

src/Android.mk

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_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_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