diff options
| author | Dan Albert <danalbert@google.com> | 2014-12-01 19:27:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-01 19:27:01 +0000 |
| commit | 57f76311ba6c32eab8032fdafe5a14dfb0519084 (patch) | |
| tree | 8d55ac74a3acee3ea88638ce442cf880a72ce59d | |
| parent | 1c7368d7c0afa7b247a0f5fe303c44c0403c63a6 (diff) | |
| parent | 84851b23d6f65ce03da4fa8ef2348b4f46c0ed0f (diff) | |
| download | android_external_aac-57f76311ba6c32eab8032fdafe5a14dfb0519084.tar.gz android_external_aac-57f76311ba6c32eab8032fdafe5a14dfb0519084.tar.bz2 android_external_aac-57f76311ba6c32eab8032fdafe5a14dfb0519084.zip | |
am 84851b23: Merge "Move back to C++98."
* commit '84851b23d6f65ce03da4fa8ef2348b4f46c0ed0f':
Move back to C++98.
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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) |