summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-11-28 13:55:24 -0800
committerDan Albert <danalbert@google.com>2014-11-28 13:56:59 -0800
commitd52f3747683184beac66bde6feea7ac6f8bf783e (patch)
tree8d55ac74a3acee3ea88638ce442cf880a72ce59d
parentd149516e1a3a63549d2c654b1398544d5de46a3e (diff)
downloadfdk-aac-d52f3747683184beac66bde6feea7ac6f8bf783e.tar.gz
fdk-aac-d52f3747683184beac66bde6feea7ac6f8bf783e.tar.bz2
fdk-aac-d52f3747683184beac66bde6feea7ac6f8bf783e.zip
Move back to C++98.
This code depends on narrowing hex literals to a signed long, which trips -Wc++11-narrowing (the fix would be to explicitly cast each value to signed). Change-Id: I581a02ef0eeee5a2d95ce0ff2ec6f7ff26f3a074
-rw-r--r--Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 9e56a2d..dcf8cf6 100644
--- 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)