commit d52f3747683184beac66bde6feea7ac6f8bf783e
author Dan Albert <danalbert@google.com> Fri Nov 28 13:55:24 2014 -0800
committer Dan Albert <danalbert@google.com> Fri Nov 28 13:56:59 2014 -0800
tree 8d55ac74a3acee3ea88638ce442cf880a72ce59d
parent d149516e1a3a63549d2c654b1398544d5de46a3e

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

Android.mk

diff --git a/Android.mk b/Android.mk
index 9e56a2d..dcf8cf6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,7 +39,6 @@
         $(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_CLANG_CPPFLAGS += \
         -Wno-pointer-bool-conversion
 
+LOCAL_CPPFLAGS += -std=c++98
+
 LOCAL_MODULE:= libFraunhoferAAC
 
 include $(BUILD_STATIC_LIBRARY)