commit db985372bfc2a91ddd62b04a743f479ae4ae2a77
author Dan Albert <danalbert@google.com> Thu Nov 20 23:07:55 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 20 23:07:55 2014 +0000
tree 86cba8fd8ca4c7764ef36c473835fede85ca366f
parent 67883b9be08f397bd680cd0d2b5185532c76def1
parent 56cad5427cdf38f98935dd53e6b4c6563d9697f7

Merge "Use an older standard for the NDK gtest libs."

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index f4e18cf..adcb6d5 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -40,7 +40,7 @@
   -Wno-missing-field-initializers \
 
 #######################################################################
-# gtest lib target
+# gtest lib for the NDK
 
 include $(CLEAR_VARS)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
@@ -51,13 +51,14 @@
 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_MODULE := libgtest_ndk
 
 include $(BUILD_STATIC_LIBRARY)
 
 #######################################################################
-# gtest_main lib target
+# gtest_main for the NDK
 
 include $(CLEAR_VARS)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
@@ -68,6 +69,7 @@
 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_MODULE := libgtest_main_ndk