diff options
| author | Martin Storsjo <martin@martin.st> | 2014-11-07 09:32:48 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2014-11-07 09:32:48 +0200 |
| commit | 6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f (patch) | |
| tree | da3cf1b27c50bd6d81be8b0183f494d15539027a /Android.mk | |
| parent | ce1863444a9e1d825c53bb3929f0b8fe664a6464 (diff) | |
| parent | d149516e1a3a63549d2c654b1398544d5de46a3e (diff) | |
| download | fdk-aac-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.tar.gz fdk-aac-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.tar.bz2 fdk-aac-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -53,6 +53,11 @@ 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_MODULE:= libFraunhoferAAC include $(BUILD_STATIC_LIBRARY) |