am 84851b23: Merge "Move back to C++98."

* commit '84851b23d6f65ce03da4fa8ef2348b4f46c0ed0f': Move back to C++98.
2014-12-01 19:27:01 +00:00 · 2014-12-01 19:27:01 +00:00 · 57f76311ba
commit 57f76311ba
parent 1c7368d7c0 84851b23d6
1 changed files with 2 additions and 1 deletions
--- a/Android.mk
+++ b/Android.mk
@ -39,7 +39,6 @@ LOCAL_SRC_FILES := \
        $(sbrdec_sources:%=libSBRdec/src/%) \
        $(sbrenc_sources:%=libSBRenc/src/%)

-LOCAL_CFLAGS := -DANDROID
 LOCAL_CFLAGS += -Wno-sequence-point -Wno-extra

 LOCAL_C_INCLUDES := \
@ -58,6 +57,8 @@ LOCAL_C_INCLUDES := \
 LOCAL_CLANG_CPPFLAGS += \
        -Wno-pointer-bool-conversion

+LOCAL_CPPFLAGS += -std=c++98
+
 LOCAL_MODULE:= libFraunhoferAAC

 include $(BUILD_STATIC_LIBRARY)