Skip to content

F
fdk-aac
Commit 57f76311 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files
Options

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

* commit '84851b23':
  Move back to C++98.
parents 1c7368d7 84851b23
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
Android.mk
View file @ 57f76311
...@@ -39,7 +39,6 @@ LOCAL_SRC_FILES := \ ...@@ -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 := \ ...@@ -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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment