aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2016-10-18 03:18:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-18 03:18:40 +0000
commit8124c22bb7be48fdc496b2148c1315b911f309e8 (patch)
tree0a1be934e56560c4585d2606ec53336a6a3793f4 /Android.mk
parentca6ae4ffe4c5b38b4a3619dec4a51c60257e77ef (diff)
parent515fb25ef76da9b8a1ad842aaccd3ebb6790c5dc (diff)
downloadfdk-aac-8124c22bb7be48fdc496b2148c1315b911f309e8.tar.gz
fdk-aac-8124c22bb7be48fdc496b2148c1315b911f309e8.tar.bz2
fdk-aac-8124c22bb7be48fdc496b2148c1315b911f309e8.zip
Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8
am: 515fb25ef7 Change-Id: Ic97d0e64efee960f87b2cb7581666b2af05873cd
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 519e820..18bda23 100644
--- a/Android.mk
+++ b/Android.mk
@@ -54,8 +54,6 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/libSBRenc/include
-LOCAL_CPPFLAGS += -std=c++98
-
LOCAL_MODULE:= libFraunhoferAAC
include $(BUILD_STATIC_LIBRARY)