commit a335cab23fd88de9c5ca20c4e66620cab32cfac5
author Dan Albert <danalbert@google.com> Tue Mar 22 17:21:36 2016 -0700
committer Dan Albert <danalbert@google.com> Tue Mar 22 17:21:36 2016 -0700
tree 9f1fef357f428ab1f6e6308691bd5dea5432501d
parent 0b16dd0724bd060293712350d1a8030bbeedff11

Add gtest libs for all NDK STLs.

Any tests built with gtest need to use the same STL that gtest was
built with, so we need one per STL.

Bug: http://b/27801981
Change-Id: Iea780479afe8a184d486638424a4911f6e01c9b9

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index 8763244..e2b4e79 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -81,6 +81,82 @@
 include $(BUILD_STATIC_LIBRARY)
 
 #######################################################################
+# gtest lib for the NDK, with libc++
+
+include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
+LOCAL_SDK_VERSION := 9
+LOCAL_NDK_STL_VARIANT := c++_static
+
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_SRC_FILES := gtest-all.cc
+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_libcxx
+
+include $(BUILD_STATIC_LIBRARY)
+
+#######################################################################
+# gtest_main for the NDK, with libc++
+
+include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
+LOCAL_SDK_VERSION := 9
+LOCAL_NDK_STL_VARIANT := c++_static
+
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_SRC_FILES := gtest_main.cc
+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_libcxx
+
+include $(BUILD_STATIC_LIBRARY)
+
+#######################################################################
+# gtest lib for the NDK, with gnustl
+
+include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
+LOCAL_SDK_VERSION := 9
+LOCAL_NDK_STL_VARIANT := gnustl_static
+
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_SRC_FILES := gtest-all.cc
+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_gnustl
+
+include $(BUILD_STATIC_LIBRARY)
+
+#######################################################################
+# gtest_main for the NDK, with gnustl
+
+include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
+LOCAL_SDK_VERSION := 9
+LOCAL_NDK_STL_VARIANT := gnustl_static
+
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_SRC_FILES := gtest_main.cc
+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_gnustl
+
+include $(BUILD_STATIC_LIBRARY)
+
+#######################################################################
 # gtest lib host
 
 include $(CLEAR_VARS)