From d52f3747683184beac66bde6feea7ac6f8bf783e Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Fri, 28 Nov 2014 13:55:24 -0800
Subject: [PATCH] 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)