diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 11:21:27 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-20 11:21:27 -0800 |
| commit | 56cad5427cdf38f98935dd53e6b4c6563d9697f7 (patch) | |
| tree | 86cba8fd8ca4c7764ef36c473835fede85ca366f | |
| parent | 67883b9be08f397bd680cd0d2b5185532c76def1 (diff) | |
| download | gtest-56cad5427cdf38f98935dd53e6b4c6563d9697f7.tar.gz | |
Use an older standard for the NDK gtest libs.
stlport is not fully compatible with C++11, and gtest manages to break
it. Use an older standard to avoid this.
Bug: 18466763
Change-Id: I075219059321cbe9df5f737559e15f8be621213d
| -rw-r--r-- | src/Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ libgtest_cflags := \ -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_NDK_STL_VARIANT := stlport_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_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_NDK_STL_VARIANT := stlport_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_MODULE := libgtest_main_ndk |