diff options
| author | Martin Storsjo <martin@martin.st> | 2015-03-03 10:52:42 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2015-03-03 10:52:42 +0200 |
| commit | d7fca408b48bbff22d186c42c75c9fe7a79b4515 (patch) | |
| tree | 0ae0bd9722aa4433179fa9e4f0d51c4b2782b0c7 /Android.mk | |
| parent | 97b382cd3f38e8b6082a9e4a37e701f02158d756 (diff) | |
| parent | 2b6bf8dc0941f3a4531030b950cf24fd31248b0b (diff) | |
| download | fdk-aac-d7fca408b48bbff22d186c42c75c9fe7a79b4515.tar.gz fdk-aac-d7fca408b48bbff22d186c42c75c9fe7a79b4515.tar.bz2 fdk-aac-d7fca408b48bbff22d186c42c75c9fe7a79b4515.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -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 := \ @@ -53,10 +52,8 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/libSBRdec/include \ $(LOCAL_PATH)/libSBRenc/include -# In tpdec_asc.cpp: address of array 'pPce->FrontElementIsCpe' -# will always evaluate to 'true'. -LOCAL_CLANG_CPPFLAGS += \ - -Wno-pointer-bool-conversion + +LOCAL_CPPFLAGS += -std=c++98 LOCAL_MODULE:= libFraunhoferAAC |