fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-06-05 22:39:13 +02:00
Code Issues Projects Releases Wiki Activity

Merge "Move back to C++98."

Browse Source
This commit is contained in:
Dan Albert
2014-12-01 19:15:29 +00:00
committed by Gerrit Code Review
parent d149516e1a d52f374768
commit 84851b23d6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@@ -39,7 +39,6 @@ LOCAL_SRC_FILES := \
$(sbrdec_sources:%=libSBRdec/src/%) \ $(sbrdec_sources:%=libSBRdec/src/%) \
$(sbrenc_sources:%=libSBRenc/src/%) $(sbrenc_sources:%=libSBRenc/src/%)
LOCAL_CFLAGS := -DANDROID
LOCAL_CFLAGS += -Wno-sequence-point -Wno-extra LOCAL_CFLAGS += -Wno-sequence-point -Wno-extra
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
@@ -58,6 +57,8 @@ LOCAL_C_INCLUDES := \
LOCAL_CLANG_CPPFLAGS += \ LOCAL_CLANG_CPPFLAGS += \
-Wno-pointer-bool-conversion -Wno-pointer-bool-conversion
LOCAL_CPPFLAGS += -std=c++98
LOCAL_MODULE:= libFraunhoferAAC LOCAL_MODULE:= libFraunhoferAAC
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)