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

* commit '84851b23': Move back to C++98.

am 84851b23: Merge "Move back to C++98."
* commit '84851b23': Move back to C++98.
57f76311 · Dan Albert · Android Git Automerger · 1c7368d7 · 84851b23 · 57f76311
Commit 57f76311 authored Dec 01, 2014 by Dan Albert Committed by Android Git Automerger Dec 01, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Android.mk Android.mk +2 -1

No files found.
--- 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)