Merge "add gtest to darwin and windows whitelist for adb_test"
diff --git a/src/Android.mk b/src/Android.mk
index 0005a0f..8763244 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -36,6 +36,9 @@
$(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../include \
+libgtest_export_include_dirs := \
+ $(LOCAL_PATH)/../include
+
libgtest_cflags := \
-Wno-missing-field-initializers \
@@ -53,6 +56,7 @@
LOCAL_C_INCLUDES := $(libgtest_target_includes)
LOCAL_CPPFLAGS := -std=gnu++98
LOCAL_CFLAGS += $(libgtest_cflags)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
LOCAL_MODULE := libgtest_ndk
include $(BUILD_STATIC_LIBRARY)
@@ -71,6 +75,7 @@
LOCAL_C_INCLUDES := $(libgtest_target_includes)
LOCAL_CPPFLAGS := -std=gnu++98
LOCAL_CFLAGS += $(libgtest_cflags)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
LOCAL_MODULE := libgtest_main_ndk
include $(BUILD_STATIC_LIBRARY)
@@ -84,6 +89,7 @@
LOCAL_SRC_FILES := gtest-all.cc
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
@@ -101,6 +107,7 @@
LOCAL_SRC_FILES := gtest_main.cc
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
@@ -120,6 +127,7 @@
LOCAL_SRC_FILES := gtest-all.cc
LOCAL_C_INCLUDES := $(libgtest_target_includes)
LOCAL_CFLAGS += $(libgtest_cflags)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
LOCAL_MODULE := libgtest
LOCAL_SANITIZE := never
LOCAL_RTTI_FLAG := -frtti
@@ -136,6 +144,7 @@
LOCAL_SRC_FILES := gtest_main.cc
LOCAL_C_INCLUDES := $(libgtest_target_includes)
LOCAL_CFLAGS += $(libgtest_cflags)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs)
LOCAL_MODULE := libgtest_main
LOCAL_SANITIZE := never