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