diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 23:07:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-20 23:07:55 +0000 |
| commit | db985372bfc2a91ddd62b04a743f479ae4ae2a77 (patch) | |
| tree | 86cba8fd8ca4c7764ef36c473835fede85ca366f | |
| parent | 67883b9be08f397bd680cd0d2b5185532c76def1 (diff) | |
| parent | 56cad5427cdf38f98935dd53e6b4c6563d9697f7 (diff) | |
| download | gtest-db985372bfc2a91ddd62b04a743f479ae4ae2a77.tar.gz | |
Merge "Use an older standard for the NDK gtest libs."gradle_1.2.3gradle_1.2.2gradle_1.2.1gradle_1.2.0-rc1gradle_1.2.0-beta1gradle_1.2.0gradle_1.1.3gradle_1.1.2gradle_1.1.1gradle_1.1.0-rc3gradle_1.1.0-rc2gradle_1.1.0-rc1gradle_1.1.0android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1studio-master-releasestudio-1.1-releaselollipop-wear-release
| -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 |