From 0e5af65c467b2423a0b857ae3ad98c91acc1e190 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Mon, 11 Nov 2019 11:38:02 +0100 Subject: Include patched FDK-AAC in the repository The initial idea was to get the DAB+ patch into upstream, but since that follows the android source releases, there is no place for a custom DAB+ patch there. So instead of having to maintain a patched fdk-aac that has to have the same .so version as the distribution package on which it is installed, we prefer having a separate fdk-aac-dab library to avoid collision. At that point, there's no reason to keep fdk-aac in a separate repository, as odr-audioenc is the only tool that needs DAB+ encoding support. Including it here simplifies installation, and makes it consistent with toolame-dab, also shipped in this repository. DAB+ decoding support (needed by ODR-SourceCompanion, dablin, etisnoop, welle.io and others) can be done using upstream FDK-AAC. --- fdk-aac/Android.bp | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 fdk-aac/Android.bp (limited to 'fdk-aac/Android.bp') diff --git a/fdk-aac/Android.bp b/fdk-aac/Android.bp new file mode 100644 index 0000000..dce6fdd --- /dev/null +++ b/fdk-aac/Android.bp @@ -0,0 +1,53 @@ +cc_library_static { + name: "libFraunhoferAAC", + vendor_available: true, + srcs: [ + "libAACdec/src/*.cpp", + "libAACenc/src/*.cpp", + "libPCMutils/src/*.cpp", + "libFDK/src/*.cpp", + "libSYS/src/*.cpp", + "libMpegTPDec/src/*.cpp", + "libMpegTPEnc/src/*.cpp", + "libSBRdec/src/*.cpp", + "libSBRenc/src/*.cpp", + "libArithCoding/src/*.cpp", + "libDRCdec/src/*.cpp", + "libSACdec/src/*.cpp", + "libSACenc/src/*.cpp", + ], + cflags: [ + "-Werror", + "-Wno-unused-parameter", + "-Wno-#warnings", + "-Wuninitialized", + "-Wno-self-assign", + "-Wno-implicit-fallthrough", + ], + sanitize: { + misc_undefined:[ + "unsigned-integer-overflow", + "signed-integer-overflow", + "bounds", + ], + cfi: true, + }, + shared_libs: [ + "liblog", + ], + export_include_dirs: [ + "libAACdec/include", + "libAACenc/include", + "libPCMutils/include", + "libFDK/include", + "libSYS/include", + "libMpegTPDec/include", + "libMpegTPEnc/include", + "libSBRdec/include", + "libSBRenc/include", + "libArithCoding/include", + "libDRCdec/include", + "libSACdec/include", + "libSACenc/include", + ], +} -- cgit v1.2.3